diff options
| author | Alan Viverette <alanv@google.com> | 2014-09-17 12:19:56 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-09-17 12:19:56 -0700 |
| commit | 59b2d80f883027a504fd38f3e2215bf84023f983 (patch) | |
| tree | cd86f0a7f6ee08eaa64258e4cd80c734462aab42 | |
| parent | 47e3124da0ba09d8b5ea2c6273010cb2312897bd (diff) | |
| download | frameworks_base-59b2d80f883027a504fd38f3e2215bf84023f983.zip frameworks_base-59b2d80f883027a504fd38f3e2215bf84023f983.tar.gz frameworks_base-59b2d80f883027a504fd38f3e2215bf84023f983.tar.bz2 | |
Revert body font size to 14sp, fix ActionBar menu text color
BUG: 17549070
BUG: 17538527
Change-Id: Id4d412ae3c035c6f76ae10569658a0d97e36a0e8
| -rw-r--r-- | core/res/res/values/dimens_material.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/themes_material.xml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/res/res/values/dimens_material.xml b/core/res/res/values/dimens_material.xml index 2b49ba2..ac5890a 100644 --- a/core/res/res/values/dimens_material.xml +++ b/core/res/res/values/dimens_material.xml @@ -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> diff --git a/core/res/res/values/themes_material.xml b/core/res/res/values/themes_material.xml index a984cfa..ebff965 100644 --- a/core/res/res/values/themes_material.xml +++ b/core/res/res/values/themes_material.xml @@ -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> |