diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-06-19 12:40:59 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-06-19 20:00:08 +0000 |
| commit | ea7890cd5e829ed3f0b5f726561c569690af2030 (patch) | |
| tree | 235ab5ab9f9215782c29ef350d275fe12e7b2f74 /java/com/android/contacts/common/res/values | |
| parent | 91ce7d2a476bd04fe525049a37a2f8b2824e9724 (diff) | |
Update AOSP Dialer source from internal google3 repository at
cl/159428781.
Test: make, treehugger
This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/158012278 (6/05/2017) to cl/159428781 (6/19/2017).
This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.
Merged-In: Ie60a84b3936efd0ea3d95d7c86bf96d2b1663030
Change-Id: If1fa394df2609f0d38b4f794c83f4db3f1006484
Diffstat (limited to 'java/com/android/contacts/common/res/values')
| -rw-r--r-- | java/com/android/contacts/common/res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | java/com/android/contacts/common/res/values/strings.xml | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/java/com/android/contacts/common/res/values/dimens.xml b/java/com/android/contacts/common/res/values/dimens.xml index 642eb31a4..26f095f39 100644 --- a/java/com/android/contacts/common/res/values/dimens.xml +++ b/java/com/android/contacts/common/res/values/dimens.xml @@ -107,7 +107,7 @@ <dimen name="tab_selected_underline_height">2dp</dimen> <!-- Size of text in tabs. --> <dimen name="tab_text_size">14sp</dimen> - <dimen name="tab_elevation">2dp</dimen> + <dimen name="tab_elevation">0dp</dimen> <dimen name="tab_unread_count_background_size">16dp</dimen> <dimen name="tab_unread_count_background_radius">2dp</dimen> <dimen name="tab_unread_count_margin_left">0dp</dimen> diff --git a/java/com/android/contacts/common/res/values/strings.xml b/java/com/android/contacts/common/res/values/strings.xml index 371d5b424..85866f736 100644 --- a/java/com/android/contacts/common/res/values/strings.xml +++ b/java/com/android/contacts/common/res/values/strings.xml @@ -143,6 +143,9 @@ <!-- Directory partition name (also exists in contacts) --> <string name="contactsList">Contacts</string> + <!-- Directory partition name for p13n suggestions --> + <string name="contact_suggestions">Top Suggested</string> + <!-- The name of the invisible local contact directory --> <string name="local_invisible_directory">Other</string> @@ -155,6 +158,9 @@ <!-- The label in section header in the contact list for a local contacts [CHAR LIMIT=128] --> <string name="local_search_label">All contacts</string> + <!-- The label in section header in the contact list for a local suggested contacts [CHAR LIMIT=128] --> + <string name="local_suggestions_search_label">Suggestions</string> + <!-- String describing the text on the header of the profile contact in the contacts list This may be programatically capitalized. [CHAR LIMIT=20] --> <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Me</string> |