diff options
| author | James Cook <jamescook@google.com> | 2015-06-10 15:47:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-10 15:47:23 +0000 |
| commit | f22030d1c59aca4f9ad2af7d4c4d646b0b619f27 (patch) | |
| tree | 4089ddeba8e2c458b3dcc90e0bb7ce25f1fc18e4 /core | |
| parent | 0c3aa4834efd91ea9559486fed1d613fd4289969 (diff) | |
| parent | ad358550372f4125689fec33c90f87d8733f1b63 (diff) | |
| download | frameworks_base-f22030d1c59aca4f9ad2af7d4c4d646b0b619f27.zip frameworks_base-f22030d1c59aca4f9ad2af7d4c4d646b0b619f27.tar.gz frameworks_base-f22030d1c59aca4f9ad2af7d4c4d646b0b619f27.tar.bz2 | |
Merge "Fix ActionButton.CloseMode minWidth to match Toolbar.Button.Navigation" into mnc-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values/styles.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/styles_material.xml | 2 |
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"> |