Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 27e104d5: am e1c68765: Merge "ActionBar menu text should look like Button" into mnc-dev

Browse Source 
* commit '27e104d56fc115c940429998c10d4bc7519f2f2d':
  ActionBar menu text should look like Button
This commit is contained in:
Alan Viverette
2015-06-02 14:21:13 +00:00
committed by Android Git Automerger
parent 7689a967a7 27e104d56f
commit cff4394db1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values/styles_material.xml
View File

@@ -348,12 +348,12 @@ please see styles_device_defaults.xml.
</style> </style>
<style name="TextAppearance.Material.Widget.ActionBar.Menu" <style name="TextAppearance.Material.Widget.ActionBar.Menu"
parent="TextAppearance.Material.Menu"> parent="TextAppearance.Material.Widget.Button">
<item name="textColor">?attr/actionMenuTextColor</item> <item name="textColor">?attr/actionMenuTextColor</item>
<item name="textAllCaps">@bool/config_actionMenuItemAllCaps</item> <item name="textAllCaps">@bool/config_actionMenuItemAllCaps</item>
</style> </style>
<style name="TextAppearance.Material.Widget.ActionBar.Menu.Inverse" <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="textColor">?attr/actionMenuTextColor</item>
<item name="textAllCaps">@bool/config_actionMenuItemAllCaps</item> <item name="textAllCaps">@bool/config_actionMenuItemAllCaps</item>
</style> </style>