diff options
| author | Alan Viverette <alanv@google.com> | 2014-09-17 19:51:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-17 19:51:23 +0000 |
| commit | a923dbb74a40a00542c63fe718cfd390cfd0d9d0 (patch) | |
| tree | aa27a079511c74e83f2dcf0e7ed227e2920d3f62 | |
| parent | ab94487602220160351a4b30a7dc7a26bec1b426 (diff) | |
| parent | 8e55f80d07ed16126eef29e6759157529c5dc020 (diff) | |
| download | frameworks_base-a923dbb74a40a00542c63fe718cfd390cfd0d9d0.zip frameworks_base-a923dbb74a40a00542c63fe718cfd390cfd0d9d0.tar.gz frameworks_base-a923dbb74a40a00542c63fe718cfd390cfd0d9d0.tar.bz2 | |
am 240509c5: am 7f5b034a: am f0ea4ce6: Merge "Revert body font size to 14sp, fix ActionBar menu text color" into lmp-dev
* commit '240509c542187bbe1abfea7acb48d03e35a72319':
Revert body font size to 14sp, fix ActionBar menu text color
| -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> |