diff options
| author | Andrew Sapperstein <asapperstein@google.com> | 2014-08-21 00:29:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-16 04:32:18 +0000 |
| commit | af02f066f1bc988d25915d5d47cde8a36ae51cf6 (patch) | |
| tree | d84243a07d806134d9fed4c499d58702e20f2956 /res | |
| parent | b1480a20c6802d10638aa50c4ef837a6a65739e7 (diff) | |
| parent | c7dbcb673faf9f4503be3cc5e5535d3f0892cf18 (diff) | |
| download | android_packages_apps_UnifiedEmail-af02f066f1bc988d25915d5d47cde8a36ae51cf6.tar.gz android_packages_apps_UnifiedEmail-af02f066f1bc988d25915d5d47cde8a36ae51cf6.tar.bz2 android_packages_apps_UnifiedEmail-af02f066f1bc988d25915d5d47cde8a36ae51cf6.zip | |
Merge "Align overflow properly. b/16984437" into ub-gmail-ur14-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-v19/conversation_message_upper_header_actions_land_or_tablet.xml | 7 | ||||
| -rw-r--r-- | res/layout/conversation_message_upper_header_actions.xml | 7 | ||||
| -rw-r--r-- | res/values-sw600dp/dimen.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 |
4 files changed, 11 insertions, 8 deletions
diff --git a/res/layout-v19/conversation_message_upper_header_actions_land_or_tablet.xml b/res/layout-v19/conversation_message_upper_header_actions_land_or_tablet.xml index 165ff77fc..c780f6601 100644 --- a/res/layout-v19/conversation_message_upper_header_actions_land_or_tablet.xml +++ b/res/layout-v19/conversation_message_upper_header_actions_land_or_tablet.xml @@ -39,7 +39,8 @@ android:contentDescription="@string/forward" /> <ImageView android:id="@+id/overflow" - android:layout_height="@dimen/message_header_action_button_height" - android:layout_width="@dimen/message_header_action_button_width" - style="@style/OverflowButtonStyle" /> + android:layout_width="56dp" + style="@style/MessageHeaderActionButtonStyle" + android:src="@drawable/ic_overflow_24dp" + android:contentDescription="@string/overflow_description" /> </merge> diff --git a/res/layout/conversation_message_upper_header_actions.xml b/res/layout/conversation_message_upper_header_actions.xml index 69297ad47..0b3afcf4b 100644 --- a/res/layout/conversation_message_upper_header_actions.xml +++ b/res/layout/conversation_message_upper_header_actions.xml @@ -38,8 +38,9 @@ <ImageView android:id="@+id/overflow" - android:layout_width="@dimen/message_header_action_button_width" - android:layout_height="@dimen/message_header_action_button_height" - style="@style/OverflowButtonStyle" /> + android:layout_width="56dp" + android:contentDescription="@string/overflow_description" + android:src="@drawable/ic_overflow_24dp" + style="@style/MessageHeaderActionButtonStyle" /> </merge> diff --git a/res/values-sw600dp/dimen.xml b/res/values-sw600dp/dimen.xml index 5d2bea33e..eb5aa85fa 100644 --- a/res/values-sw600dp/dimen.xml +++ b/res/values-sw600dp/dimen.xml @@ -24,8 +24,6 @@ <dimen name="message_header_icon_margin">24dp</dimen> <dimen name="message_header_icon_additional_margin_start">32dp</dimen> - <dimen name="message_header_action_button_width">56dp</dimen> - <dimen name="message_header_action_button_height">56dp</dimen> <dimen name="message_header_action_button_margin_top">8dp</dimen> <dimen name="message_header_text_margin_top">22dp</dimen> <dimen name="message_header_margin_bottom">24dp</dimen> diff --git a/res/values/strings.xml b/res/values/strings.xml index d925dd574..4b66b05f2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1160,5 +1160,8 @@ <!-- Name of the Settings activity --> <string name="activity_preferences">Settings</string> + <!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] --> + <string name="overflow_description">More options</string> + <string name="user_agent_format" translatable="false">%1$s AndroidUnifiedEmail/%2$s</string> </resources> |