summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Cook <jamescook@google.com>2015-06-09 15:16:44 -0700
committerJames Cook <jamescook@google.com>2015-06-09 15:16:44 -0700
commitad358550372f4125689fec33c90f87d8733f1b63 (patch)
tree681439809c8f53020404a7b5d51ee5cc1abece81
parentaaf68f216327a8a2adaf72032904b50796b4aea7 (diff)
downloadframeworks_base-ad358550372f4125689fec33c90f87d8733f1b63.zip
frameworks_base-ad358550372f4125689fec33c90f87d8733f1b63.tar.gz
frameworks_base-ad358550372f4125689fec33c90f87d8733f1b63.tar.bz2
Fix ActionButton.CloseMode minWidth to match Toolbar.Button.Navigation
They both need to be 56dp for the buttons to line up properly. This ports If24608d9f8dbf912025967bf3adef13df105ddaa from frameworks/support in lmp-mr1-ub-dev Bug: 19317317 Change-Id: Ie1f77b8cfada45bb9f8b2d14e68c364ae4ebf579
-rw-r--r--core/res/res/values/styles.xml2
-rw-r--r--core/res/res/values/styles_material.xml2
2 files changed, 4 insertions, 0 deletions
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index 4c02d79..4eba117 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -1279,6 +1279,8 @@ please see styles_device_defaults.xml.
</style>
<style name="Widget.ActionButton.CloseMode">
+ <!-- Should match Widget.Toolbar.Button.Navigation minWidth. -->
+ <item name="minWidth">56dp</item>
</style>
<style name="Widget.ActionBar.TabView" parent="Widget">
diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml
index f89dced..df4106e 100644
--- a/core/res/res/values/styles_material.xml
+++ b/core/res/res/values/styles_material.xml
@@ -866,6 +866,8 @@ please see styles_device_defaults.xml.
<style name="Widget.Material.ActionButton.CloseMode">
<item name="background">@drawable/control_background_material</item>
+ <!-- Should match Widget.Material.Toolbar.Button.Navigation minWidth. -->
+ <item name="minWidth">56dp</item>
</style>
<style name="Widget.Material.ActionButton.Overflow">