diff options
| author | Andrew Lee <anwlee@google.com> | 2015-05-05 17:30:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-05 17:30:23 +0000 |
| commit | 9410a60482dcbcc4fb11b6af8e80faffea4aacda (patch) | |
| tree | c9123ece71181ec86e65f89e50d50c4dd2395831 /res/layout | |
| parent | 7ea6420e790c4206f4cfa44ff22604536cebd5f7 (diff) | |
| parent | 69705be50fc4c84b35df88c879dd9a4b4de655b3 (diff) | |
Merge "Add "show call history" list item." into mnc-dev
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/call_log_list_item.xml | 4 | ||||
| -rw-r--r-- | res/layout/show_call_history_list_item.xml | 30 |
2 files changed, 32 insertions, 2 deletions
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml index a0ed5c799..5928183f8 100644 --- a/res/layout/call_log_list_item.xml +++ b/res/layout/call_log_list_item.xml @@ -49,8 +49,8 @@ android:layout_height="wrap_content" android:paddingStart="@dimen/call_log_start_margin" android:paddingEnd="@dimen/call_log_outer_margin" - android:paddingTop="@dimen/call_log_outer_margin" - android:paddingBottom="@dimen/call_log_outer_margin" + android:paddingTop="@dimen/call_log_vertical_padding" + android:paddingBottom="@dimen/call_log_vertical_padding" android:orientation="horizontal" android:gravity="center_vertical" android:focusable="true" diff --git a/res/layout/show_call_history_list_item.xml b/res/layout/show_call_history_list_item.xml new file mode 100644 index 000000000..1264894a9 --- /dev/null +++ b/res/layout/show_call_history_list_item.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/CallLogCardStyle" + android:layout_height="40dp" + android:clickable="true" + android:foreground="?android:attr/selectableItemBackground"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:text="@string/show_call_history" /> + +</android.support.v7.widget.CardView> + |