diff options
| author | Andrew Lee <anwlee@google.com> | 2015-08-13 21:53:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-13 21:53:34 +0000 |
| commit | c4079241a7ea29773cfec497281a114b7cbbbddd (patch) | |
| tree | 45d806761e91adc4fdd067ed0c65a4c68a799ca7 /res/layout | |
| parent | ed6a6e0dfae1adc99087361c0b6d6d27eff4eea1 (diff) | |
| parent | a4adb2c035690a1c9600a20c2485886d9d5991d0 (diff) | |
Merge "Show entire call history in Dialer tab."
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/call_log_fragment.xml | 4 | ||||
| -rw-r--r-- | res/layout/show_call_history_list_item.xml | 30 |
2 files changed, 3 insertions, 31 deletions
diff --git a/res/layout/call_log_fragment.xml b/res/layout/call_log_fragment.xml index f69c5139f..aad7d8e77 100644 --- a/res/layout/call_log_fragment.xml +++ b/res/layout/call_log_fragment.xml @@ -24,8 +24,10 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/background_dialer_call_log" + android:clipToPadding="false" android:paddingStart="@dimen/call_log_horizontal_margin" - android:paddingEnd="@dimen/call_log_horizontal_margin" /> + android:paddingEnd="@dimen/call_log_horizontal_margin" + android:paddingBottom="@dimen/floating_action_button_list_bottom_padding" /> <com.android.dialer.widget.EmptyContentView android:id="@+id/empty_list_view" diff --git a/res/layout/show_call_history_list_item.xml b/res/layout/show_call_history_list_item.xml deleted file mode 100644 index 1264894a9..000000000 --- a/res/layout/show_call_history_list_item.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?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> - |