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

Merge "Revert body font size to 14sp, fix ActionBar menu text color" into lmp-dev

Browse Source
This commit is contained in:
Alan Viverette
2014-09-17 19:20:32 +00:00
committed by Android (Google) Code Review
parent d25e864dde 59b2d80f88
commit ae1990f406
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,8 +45,8 @@
<dimen name="text_size_title_material_toolbar">@dimen/text_size_title_material</dimen>
<dimen name="text_size_subtitle_material_toolbar">@dimen/text_size_subhead_material</dimen>
<dimen name="text_size_menu_material">16sp</dimen>
<dimen name="text_size_body_2_material">16sp</dimen>
<dimen name="text_size_body_1_material">16sp</dimen>
<dimen name="text_size_body_2_material">14sp</dimen>
<dimen name="text_size_body_1_material">14sp</dimen>
<dimen name="text_size_caption_material">12sp</dimen>
<dimen name="text_size_button_material">14sp</dimen>

2
core/res/res/values/themes_material.xml
View File

@@ -316,6 +316,8 @@ please see themes_device_defaults.xml.
<item name="actionBarStyle">@style/Widget.Material.ActionBar.Solid</item>
<item name="actionBarSize">@dimen/action_bar_default_height_material</item>
<item name="actionModePopupWindowStyle">@style/Widget.Material.PopupWindow.ActionMode</item>
<item name="actionMenuTextAppearance">@style/TextAppearance.Material.Widget.ActionBar.Menu</item>
<item name="actionMenuTextColor">?attr/textColorPrimary</item>
<item name="actionBarWidgetTheme">@null</item>
<item name="actionBarPopupTheme">@null</item>
<item name="actionBarTheme">@style/ThemeOverlay.Material.ActionBar</item>