summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorBrian Attwell <brianattwell@google.com>2014-11-25 20:45:44 -0800
committerBrian Attwell <brianattwell@google.com>2014-11-26 05:11:27 +0000
commitdaa2058979fda84a0ce22e21edd53aa049e80aa0 (patch)
tree1610cbf4e72851c8553299af48f3f0dc5a019a28 /res/values
parentba8a76b0f9aa3caf21c5915276d00f36e1321b43 (diff)
downloadpackages_apps_Contacts-daa2058979fda84a0ce22e21edd53aa049e80aa0.tar.gz
packages_apps_Contacts-daa2058979fda84a0ce22e21edd53aa049e80aa0.tar.bz2
packages_apps_Contacts-daa2058979fda84a0ce22e21edd53aa049e80aa0.zip
Collapse extra raw contact editors
There are now two different header styles 1) When creating a new raw contact: if there are multiple accounts to create the raw contact under, then show a header with an acconut selector 2) Otherwise, show a visually distinct account header without a drop down account selector. If there are multiple raw contacts, this header also lets you collapse raw contacts Typical users, who only have a single writeable account, will never see header (1). This is fortunate, since switching between the two header styles is a bit visually inconsistent. Bug: 18004959 Change-Id: I133a7355a220f20b55657a6c1a51ff44665ea3b9
Diffstat (limited to 'res/values')
-rw-r--r--res/values/colors.xml4
-rw-r--r--res/values/dimens.xml8
-rw-r--r--res/values/strings.xml7
3 files changed, 12 insertions, 7 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml
index daea14bca..d9ac84ae6 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -37,8 +37,8 @@
<color name="floating_action_button_icon_color">@color/contacts_accent_color</color>
- <!-- Color of the separator between entries in an ExpandingEntryCardView -->
- <color name="expanding_entry_card_item_separator_color">#e4e4e4</color>
+ <!-- Horizontal separator line should be 12% dark in the light theme. -->
+ <color name="divider_line_color_light">#e0e0e0</color>
<!-- Color of the text on an ExpandingEntryCard button -->
<color name="expanding_entry_card_button_text_color">@android:color/black</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 1a77057e8..b31b5b9d8 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -25,9 +25,6 @@
<!-- The ratio of width:height for the contact's photo in landscape -->
<item name="quickcontact_landscape_photo_ratio" type="dimen" format="float">0.7</item>
- <!-- Top padding of the entire contact editor -->
- <dimen name="editor_padding_top">0dip</dimen>
-
<!-- Padding of the rounded plus/minus/expand/collapse buttons in the editor -->
<dimen name="editor_round_button_padding_left">16dip</dimen>
<dimen name="editor_round_button_padding_right">16dip</dimen>
@@ -174,8 +171,9 @@
<!-- Extra top padding if the title is set to null -->
<dimen name="expanding_entry_card_null_title_top_extra_padding">2dp</dimen>
- <!-- Height of the separator between entries in an ExpandingEntryCardView -->
- <dimen name="expanding_entry_card_item_separator_height">1dp</dimen>
+ <!-- Height of the separator between entries in an ExpandingEntryCardView and contact editor. -->
+ <dimen name="divider_line_height">1dp</dimen>
+
<!-- Dimensions for an entry in ExpandingEntryCardView -->
<dimen name="expanding_entry_card_item_padding_start">20dp</dimen>
<dimen name="expanding_entry_card_item_padding_end">20dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5d59f323a..e11a51961 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -705,6 +705,8 @@
<string name="header_event_entry">Event</string>
<!-- Header for the Relation entry [CHAR LIMIT=40] -->
<string name="header_relation_entry">Relation</string>
+ <!-- Content description for the account field header image. Example accounts listed in this field: Google, Hotmail and Exchange. [CHAR LIMIT=NONE] -->
+ <string name="header_account_entry">Account</string>
<!-- Content description for the name fields header entry [CHAR LIMIT=NONE] -->
<string name="header_name_entry">Name</string>
<!-- Content description for the email fields header entry [CHAR LIMIT=NONE] -->
@@ -714,6 +716,11 @@
<!-- Content description for the camera icon beside the photo section in the Raw Contact Editor [CHAR LIMIT=NONE] -->
<string name="header_photo_entry">Photo</string>
+ <!-- Content description for the expand button inside the raw contact editor's header. [CHAR LIMIT=NONE] -->
+ <string name="content_description_expand_editor">Click to expand contact editor.</string>
+ <!-- Content description for the collapse button inside the raw contact editor's header. [CHAR LIMIT=NONE] -->
+ <string name="content_description_collapse_editor">Click to collapse contact editor.</string>
+
<!-- Content description for directions secondary button [CHAR LIMIT=NONE] -->
<string name="content_description_directions">directions to location</string>