Merge "Update strings for empty lists in Dialer."
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index 3748967..d925c13 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -33,9 +33,8 @@
android:fontFamily="sans-serif-medium"
android:textColor="?attr/call_log_secondary_text_color"
android:textSize="@dimen/call_log_secondary_text_size"
- android:paddingTop="@dimen/call_log_day_group_padding"
- android:paddingBottom="1dp"
- />
+ android:paddingTop="@dimen/call_log_day_group_padding_top"
+ android:paddingBottom="@dimen/call_log_day_group_padding_bottom" />
<!-- Linear layout to separate the primary area containing the contact badge and caller
information and the secondary action (call details / play voicemail). -->
diff --git a/res/layout/empty_list_view.xml b/res/layout/empty_list_view.xml
index be4dbf5..40f58bd 100644
--- a/res/layout/empty_list_view.xml
+++ b/res/layout/empty_list_view.xml
@@ -20,15 +20,6 @@
android:layout_height="match_parent"
android:minHeight="?android:attr/listPreferredItemHeight">
- <include
- android:id="@+id/show_all_contact_button_in_nofav"
- layout="@layout/show_all_contact_button"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"/>
-
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/show_all_contact_button.xml b/res/layout/show_all_contact_button.xml
deleted file mode 100644
index 30060d7..0000000
--- a/res/layout/show_all_contact_button.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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.
--->
-
-<com.android.contacts.common.list.ContactListItemView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/show_all_contact_button"
- android:orientation="horizontal"
- android:clickable="true"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:minHeight="?android:attr/listPreferredItemHeight"
- android:gravity="center"
- android:focusable="true" />
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c6a8e9b..e5c6795 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -137,7 +137,8 @@
<dimen name="call_log_action_height">44dp</dimen>
<!-- Z Translation of expanded call log items. -->
<dimen name="call_log_expanded_translation_z">4dp</dimen>
- <dimen name="call_log_day_group_padding">15dp</dimen>
+ <dimen name="call_log_day_group_padding_top">15dp</dimen>
+ <dimen name="call_log_day_group_padding_bottom">9dp</dimen>
<!-- Size of icon for contacts number shortcuts -->
<dimen name="search_shortcut_radius">40dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4cc5af7..4816114 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -576,10 +576,6 @@
<string name="tab_all_contacts">Contacts</string>
- <!-- Title of fragment that displays all contacts -->
- <string name="show_all_contacts_title">All contacts</string>
- <!-- Title of show all contacts button -->
- <string name="show_all_contacts_button_text">All contacts</string>
<!-- Text displayed when user swipes out a favorite contact -->
<string name="favorite_hidden">Removed from favorites</string>
<!-- Text displayed for the undo button to undo removing a favorite contact -->