Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4a130fb authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

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

* commit 'f0ea4ce63510be154cbf737a3ed60deb0cbd5289':
  Revert body font size to 14sp, fix ActionBar menu text color
parents 842731df ae1990f4

core/res/res/values/dimens_material.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/themes_material.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>