diff options
| author | Alan Viverette <alanv@google.com> | 2015-06-01 22:08:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-01 22:08:28 +0000 |
| commit | e1c68765cf53473e710438f90e42e0cb26dffe1b (patch) | |
| tree | 15f003fc466208a7c64d02315be1e34ec86a40eb | |
| parent | fb2cdc4ca131ff95179414854eca02a098a29a8a (diff) | |
| parent | aa67bb14259d472b99c7cc4d5771a82efc2fd3d2 (diff) | |
| download | frameworks_base-e1c68765cf53473e710438f90e42e0cb26dffe1b.zip frameworks_base-e1c68765cf53473e710438f90e42e0cb26dffe1b.tar.gz frameworks_base-e1c68765cf53473e710438f90e42e0cb26dffe1b.tar.bz2 | |
Merge "ActionBar menu text should look like Button" into mnc-dev
| -rw-r--r-- | core/res/res/values/styles_material.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml index f9fcf38..f7a42fa 100644 --- a/core/res/res/values/styles_material.xml +++ b/core/res/res/values/styles_material.xml @@ -348,12 +348,12 @@ please see styles_device_defaults.xml. </style> <style name="TextAppearance.Material.Widget.ActionBar.Menu" - parent="TextAppearance.Material.Menu"> + parent="TextAppearance.Material.Widget.Button"> <item name="textColor">?attr/actionMenuTextColor</item> <item name="textAllCaps">@bool/config_actionMenuItemAllCaps</item> </style> <style name="TextAppearance.Material.Widget.ActionBar.Menu.Inverse" - parent="TextAppearance.Material.Menu.Inverse"> + parent="TextAppearance.Material.Widget.Button.Inverse"> <item name="textColor">?attr/actionMenuTextColor</item> <item name="textAllCaps">@bool/config_actionMenuItemAllCaps</item> </style> |