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

Commit 75d6bc1a authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Make Toolbars (and Toolbar-based ActionBars) have constant text size" into lmp-dev

parents 9e4329ea 2c818ca0

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -2047,6 +2047,8 @@ package android { 
    field public static final int TextAppearance_Material_Widget_TextView = 16974381; // 0x103022d

    field public static final int TextAppearance_Material_Widget_TextView_PopupMenu = 16974382; // 0x103022e

    field public static final int TextAppearance_Material_Widget_TextView_SpinnerItem = 16974383; // 0x103022f

    field public static final int TextAppearance_Material_Widget_Toolbar_Subtitle = 16974569; // 0x10302e9

    field public static final int TextAppearance_Material_Widget_Toolbar_Title = 16974568; // 0x10302e8

    field public static final int TextAppearance_Material_WindowTitle = 16974361; // 0x1030219

    field public static final int TextAppearance_Medium = 16973892; // 0x1030044

    field public static final int TextAppearance_Medium_Inverse = 16973893; // 0x1030045

core/res/res/values/dimens_material.xml

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 
    <dimen name="text_size_headline_material">24sp</dimen>

    <dimen name="text_size_title_material">20sp</dimen>

    <dimen name="text_size_subhead_material">16sp</dimen>

    <dimen name="text_size_title_material_toolbar">20dp</dimen>

    <dimen name="text_size_subtitle_material_toolbar">16dp</dimen>

    <dimen name="text_size_menu_material">16sp</dimen>

    <dimen name="text_size_body_2_material">14sp</dimen>

    <dimen name="text_size_body_1_material">14sp</dimen>

core/res/res/values/public.xml

+3 −0
Original line number Diff line number Diff line
@@ -2530,6 +2530,9 @@ 
  <public type="style" name="Widget.Material.Spinner.Form" />

  <public type="style" name="Widget.Material.Light.Spinner.Form" />



  <public type="style" name="TextAppearance.Material.Widget.Toolbar.Title" />

  <public type="style" name="TextAppearance.Material.Widget.Toolbar.Subtitle" />



  <public-padding type="string" name="l_resource_pad" end="0x01040030" />



  <public type="string" name="config_webSettingsDefaultTextEncoding" />

core/res/res/values/styles_material.xml

+39 −9
Original line number Diff line number Diff line
@@ -313,15 +313,38 @@ please see styles_device_defaults.xml. 
    </style>



    <style name="TextAppearance.Material.Widget.ActionMode"/>

    <style name="TextAppearance.Material.Widget.ActionMode.Title" parent="TextAppearance.Material.Title" />

    <style name="TextAppearance.Material.Widget.ActionMode.Title.Inverse" parent="TextAppearance.Material.Title.Inverse" />

    <style name="TextAppearance.Material.Widget.ActionMode.Subtitle" parent="TextAppearance.Material.Subhead" />

    <style name="TextAppearance.Material.Widget.ActionMode.Subtitle.Inverse" parent="TextAppearance.Material.Subhead.Inverse" />



    <style name="TextAppearance.Material.Widget.ActionBar.Title" parent="TextAppearance.Material.Title" />

    <style name="TextAppearance.Material.Widget.ActionBar.Title.Inverse" parent="TextAppearance.Material.Title.Inverse" />

    <style name="TextAppearance.Material.Widget.ActionBar.Subtitle" parent="TextAppearance.Material.Subhead" />

    <style name="TextAppearance.Material.Widget.ActionBar.Subtitle.Inverse" parent="TextAppearance.Material.Subhead.Inverse" />

    <style name="TextAppearance.Material.Widget.ActionMode.Title"

           parent="TextAppearance.Material.Title">

        <item name="textSize">@dimen/text_size_title_material_toolbar</item>

    </style>

    <style name="TextAppearance.Material.Widget.ActionMode.Title.Inverse"

           parent="TextAppearance.Material.Title.Inverse">

        <item name="textSize">@dimen/text_size_title_material_toolbar</item>

    </style>

    <style name="TextAppearance.Material.Widget.ActionMode.Subtitle"

           parent="TextAppearance.Material.Subhead">

        <item name="textSize">@dimen/text_size_subtitle_material_toolbar</item>

    </style>

    <style name="TextAppearance.Material.Widget.ActionMode.Subtitle.Inverse"

           parent="TextAppearance.Material.Subhead.Inverse">

        <item name="textSize">@dimen/text_size_subtitle_material_toolbar</item>

    </style>

    <style name="TextAppearance.Material.Widget.ActionBar.Title"

           parent="TextAppearance.Material.Title">

        <item name="textSize">@dimen/text_size_title_material_toolbar</item>

    </style>

    <style name="TextAppearance.Material.Widget.ActionBar.Title.Inverse"

           parent="TextAppearance.Material.Title.Inverse">

        <item name="textSize">@dimen/text_size_title_material_toolbar</item>

    </style>

    <style name="TextAppearance.Material.Widget.ActionBar.Subtitle"

           parent="TextAppearance.Material.Subhead">

        <item name="textSize">@dimen/text_size_subtitle_material_toolbar</item>

    </style>

    <style name="TextAppearance.Material.Widget.ActionBar.Subtitle.Inverse"

           parent="TextAppearance.Material.Subhead.Inverse">

        <item name="textSize">@dimen/text_size_subtitle_material_toolbar</item>

    </style>



    <style name="TextAppearance.Material.Widget.ActionBar.Menu" parent="TextAppearance.Material.Menu">

        <item name="textColor">?attr/actionMenuTextColor</item>
@@ -333,6 +356,11 @@ please see styles_device_defaults.xml. 
        <item name="textAllCaps">@bool/config_actionMenuItemAllCaps</item>

    </style>



    <style name="TextAppearance.Material.Widget.Toolbar.Title"

           parent="TextAppearance.Material.Widget.ActionBar.Title" />

    <style name="TextAppearance.Material.Widget.Toolbar.Subtitle"

           parent="TextAppearance.Material.Widget.ActionBar.Subtitle" />



    <style name="TextAppearance.Material.WindowTitle" parent="TextAppearance.Material.Title" />

    <style name="TextAppearance.Material.DialogWindowTitle" parent="TextAppearance.Material.Title" />
@@ -759,6 +787,8 @@ please see styles_device_defaults.xml. 


    <style name="Widget.Material.Toolbar" parent="Widget.Toolbar">

        <item name="navigationButtonStyle">@style/Widget.Material.Toolbar.Button.Navigation</item>

        <item name="titleTextAppearance">@style/TextAppearance.Material.Widget.Toolbar.Title</item>

        <item name="subtitleTextAppearance">@style/TextAppearance.Material.Widget.Toolbar.Subtitle</item>

    </style>



    <style name="Widget.Material.Toolbar.Button.Navigation" parent="Widget.Toolbar.Button.Navigation">