Merge "Favorite tiles shouldn't be circles"
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/layout/speeddial_fragment.xml b/res/layout/speed_dial_fragment.xml
similarity index 100%
rename from res/layout/speeddial_fragment.xml
rename to res/layout/speed_dial_fragment.xml
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 6d9c77a..4816114 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -66,8 +66,8 @@
<!-- Menu item used to share a voicemail. [CHAR LIMIT=30] -->
<string name="recentCalls_shareVoicemail">Share voicemail</string>
- <!-- Text displayed when the call log is empty -->
- <string name="recentCalls_empty">Call log is empty.</string>
+ <!-- Text displayed when the call log is empty. -->
+ <string name="recentCalls_empty">Your call log is empty.</string>
<!-- Title of the confirmation dialog for clearing the call log. [CHAR LIMIT=37] -->
<string name="clearCallLogConfirmation_title">Clear call log?</string>
@@ -547,10 +547,10 @@
<string name="view_full_call_history_font_family">sans-serif</string>
<!-- Text displayed when the list of missed calls is empty -->
- <string name="recentMissed_empty">No recent missed calls.</string>
+ <string name="recentMissed_empty">You have no recent missed calls.</string>
<!-- Text displayed when the list of voicemails is empty -->
- <string name="recentVoicemails_empty">No recent voicemails.</string>
+ <string name="recentVoicemails_empty">You have no recent voicemails.</string>
<!-- Menu option to show favorite contacts only -->
<string name="show_favorites_only">Show favorites only</string>
@@ -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 -->
@@ -599,8 +595,11 @@
<!-- Number of missed calls shown on call card [CHAR LIMIT=40] -->
<string name="num_missed_calls"><xliff:g id="number">%s</xliff:g> new missed calls</string>
- <!-- Shows when there are no favorites. -->
- <string name="no_favorites">Favorites & contacts you\ncall often will show here.\nSo, start calling.</string>
+ <!-- Shown when there are no speed dial favorites. -->
+ <string name="speed_dial_empty">Speed dial is one touch dialing\nfor favorites and numbers\n you call frequently.</string>
+
+ <!-- Shown when there are no contacts in the all contacts list. -->
+ <string name="all_contacts_empty">You have no contacts.</string>
<!-- Shows up as a tooltip to provide a hint to the user that the profile pic in a contact
card can be tapped to bring up a list of all numbers, or long pressed to start reordering
diff --git a/src/com/android/dialer/list/AllContactsFragment.java b/src/com/android/dialer/list/AllContactsFragment.java
index ddcb15d..e4314db 100644
--- a/src/com/android/dialer/list/AllContactsFragment.java
+++ b/src/com/android/dialer/list/AllContactsFragment.java
@@ -52,7 +52,7 @@
View emptyListView = view.findViewById(R.id.empty_list_view);
DialerUtils.configureEmptyListView(emptyListView, R.drawable.empty_contacts,
- R.string.listFoundAllContactsZero, getResources());
+ R.string.all_contacts_empty, getResources());
getListView().setEmptyView(emptyListView);
ViewUtil.addBottomPaddingToListViewForFab(getListView(), getResources());
diff --git a/src/com/android/dialer/list/SpeedDialFragment.java b/src/com/android/dialer/list/SpeedDialFragment.java
index c214492..a04d4cc 100644
--- a/src/com/android/dialer/list/SpeedDialFragment.java
+++ b/src/com/android/dialer/list/SpeedDialFragment.java
@@ -197,7 +197,7 @@
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
- mParentView = inflater.inflate(R.layout.speeddial_fragment, container, false);
+ mParentView = inflater.inflate(R.layout.speed_dial_fragment, container, false);
mListView = (PhoneFavoriteListView) mParentView.findViewById(R.id.contact_tile_list);
mListView.setOnItemClickListener(this);
@@ -213,7 +213,7 @@
final Resources resources = getResources();
mEmptyView = mParentView.findViewById(R.id.empty_list_view);
DialerUtils.configureEmptyListView(
- mEmptyView, R.drawable.empty_speed_dial, R.string.no_favorites, getResources());
+ mEmptyView, R.drawable.empty_speed_dial, R.string.speed_dial_empty, getResources());
mContactTileFrame = mParentView.findViewById(R.id.contact_tile_frame);