am c4e31b58: am a777a1b2: Make message header overflow width match toolbar.
* commit 'c4e31b586b7a9ba986ec1e46f01eaa44b668cd74':
Make message header overflow width match toolbar.
diff --git a/res/values-sw600dp/dimen.xml b/res/values-sw600dp/dimen.xml
index ce801d3..5451d7f 100644
--- a/res/values-sw600dp/dimen.xml
+++ b/res/values-sw600dp/dimen.xml
@@ -20,7 +20,6 @@
<dimen name="conversation_view_margin_side">24dp</dimen>
<dimen name="conversation_view_snack_bar_margin">16dp</dimen>
<dimen name="conversation_header_padding_side">36dp</dimen>
- <dimen name="conversation_header_star_size">55dp</dimen>
<dimen name="conversation_border_margin_side">24dp</dimen>
<dimen name="message_header_icon_margin">24dp</dimen>
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
index 3edaaa2..6155d37 100644
--- a/res/values-v21/styles.xml
+++ b/res/values-v21/styles.xml
@@ -18,6 +18,8 @@
<resources>
<style name="WaitFragmentTitleBase" parent="android:Widget.Material.TextView" />
+ <style name="ActionBarOverflowButtonStyle" parent="@android:style/Widget.Material.ActionButton.Overflow" />
+
<style name="ActionBarShadow">
<item name="android:visibility">gone</item>
</style>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index e8d9613..d46963c 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -53,13 +53,14 @@
<dimen name="conversation_view_snack_bar_margin">0dp</dimen>
<dimen name="conversation_header_font_size">20sp</dimen>
<dimen name="conversation_header_padding_side">16dp</dimen>
- <dimen name="conversation_header_star_size">52dp</dimen>
+ <dimen name="conversation_header_star_size">48dp</dimen>
<dimen name="conversation_border_margin_side">0dp</dimen>
<dimen name="message_details_header_padding_start_expanded">72dip</dimen>
<dimen name="message_details_header_padding_end">16dp</dimen>
<dimen name="message_details_header_vertical_padding">7dp</dimen>
<dimen name="message_show_pics_header_padding_end">14dip</dimen>
<dimen name="message_header_icon_additional_margin_start">16dp</dimen>
+ <dimen name="message_header_overflow_button_width">36dp</dimen>
<dimen name="message_header_action_button_width">48dp</dimen>
<dimen name="message_header_action_button_height">48dp</dimen>
<dimen name="message_header_action_button_margin_top">0dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8a39ab2..55c9ddd 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -363,7 +363,7 @@
</style>
<style name="MessageHeaderOverflowButtonStyle" parent="@style/OverflowButtonStyle">
- <item name="android:layout_width">@dimen/message_header_action_button_width</item>
+ <item name="android:layout_width">@dimen/message_header_overflow_button_width</item>
<item name="android:layout_height">@dimen/message_header_action_button_height</item>
<item name="android:layout_marginTop">@dimen/message_header_action_button_margin_top</item>
</style>
@@ -448,10 +448,6 @@
<item name="android:src">@drawable/ic_menu_moreoverflow_mtrl_alpha</item>
</style>
- <style name="ActionBarOverflowButtonStyle.Appcompat" parent="@style/Widget.AppCompat.ActionButton.Overflow">
- <item name="android:src">@drawable/ic_menu_moreoverflow_mtrl_alpha</item>
- </style>
-
<style name="ActionBarShadow">
<item name="android:visibility">visible</item>
</style>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 5f566d4..2cee638 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -18,7 +18,6 @@
<style name="UnifiedEmailTheme.Appcompat" parent="@style/Theme.AppCompat.Light.DarkActionBar">
<item name="actionModeBackground">@color/action_mode_background</item>
- <item name="actionOverflowButtonStyle">@style/ActionBarOverflowButtonStyle.Appcompat</item>
<item name="colorPrimary">@color/primary_color</item>
<item name="colorPrimaryDark">@color/primary_dark_color</item>
<item name="colorAccent">@color/accent_blue</item>
@@ -29,7 +28,6 @@
<style name="UnifiedEmailTheme.Appcompat.Toolbar" parent="@style/Theme.AppCompat.Light.NoActionBar">
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
<item name="actionModeBackground">@color/action_mode_background</item>
- <item name="actionOverflowButtonStyle">@style/ActionBarOverflowButtonStyle.Appcompat</item>
<item name="colorPrimary">@color/primary_color</item>
<item name="colorPrimaryDark">@color/primary_dark_color</item>
<item name="colorAccent">@color/accent_blue</item>