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

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

am 8f7fb2e6: am 7fd5ca87: am bac2a4be: Merge "Fix action bar title size consistency" into lmp-dev 

* commit '8f7fb2e603a268d123cac331a23495e2b46f9a8d':
  Fix action bar title size consistency
parents 46aaaf7e db583545

core/res/res/values-sw600dp/dimens_material.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 
<resources>



    <!-- Use the default title sizes on tablets. -->

    <dimen name="text_size_title_material_toolbar">@dimen/text_size_title_material</dimen>

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

    <!-- Use the default subtitle sizes on tablets. -->

    <dimen name="text_size_subtitle_material_toolbar">@dimen/text_size_subhead_material</dimen>

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

    <!-- Default height of an action bar. -->

    <dimen name="action_bar_default_height_material">64dp</dimen>

    <!-- Default padding of an action bar. -->

core/res/res/values/dimens_material.xml

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +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">@dimen/text_size_title_material</dimen>

    <dimen name="text_size_subtitle_material_toolbar">@dimen/text_size_subhead_material</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>