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

Commit c1d5b6c1 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Move padding from navigation and overflow icons to Toolbar" into mnc-dev

parents 30c5da9c fb61bb50

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

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 


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

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

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

    <dimen name="action_bar_default_padding_material">0dp</dimen>

    <!-- Default text size for action bar title.-->

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

    <!-- Default text size for action bar subtitle.-->

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

+4 −6
Original line number Diff line number Diff line
@@ -21,13 +21,11 @@ 
    <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. -->

    <dimen name="action_bar_default_padding_material">4dp</dimen>

    <!-- Default content inset of an action bar. -->

    <dimen name="action_bar_content_inset_material">24dp</dimen>



    <!-- Padding to add to the start of the overflow action button. -->

    <dimen name="action_bar_navigation_padding_start_material">8dp</dimen>

    <!-- Padding to add to the end of the overflow action button. -->

    <dimen name="action_bar_overflow_padding_end_material">18dp</dimen>

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

    <dimen name="action_bar_default_padding_start_material">8dp</dimen>

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

    <dimen name="action_bar_default_padding_end_material">8dp</dimen>

</resources>

core/res/res/values/dimens_material.xml

+4 −4
Original line number Diff line number Diff line
@@ -35,8 +35,10 @@ 


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

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

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

    <dimen name="action_bar_default_padding_material">4dp</dimen>

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

    <dimen name="action_bar_default_padding_start_material">0dp</dimen>

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

    <dimen name="action_bar_default_padding_end_material">0dp</dimen>

    <!-- Default content inset of an action bar. -->

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

    <!-- Vertical padding around action bar icons. -->
@@ -50,8 +52,6 @@ 
         content inset so that ListActivity items line up correctly. -->

    <dimen name="list_item_padding_horizontal_material">@dimen/action_bar_content_inset_material</dimen>



    <!-- Padding to add to the start of the overflow action button. -->

    <dimen name="action_bar_navigation_padding_start_material">0dp</dimen>

    <!-- Padding to add to the start of the overflow action button. -->

    <dimen name="action_bar_overflow_padding_start_material">6dp</dimen>

    <!-- Padding to add to the end of the overflow action button. -->

core/res/res/values/styles_material.xml

+2 −1
Original line number Diff line number Diff line
@@ -809,13 +809,14 @@ please see styles_device_defaults.xml. 
        <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>

        <item name="paddingStart">@dimen/action_bar_default_padding_start_material</item>

        <item name="paddingEnd">@dimen/action_bar_default_padding_end_material</item>

    </style>



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

        <item name="background">@drawable/control_background_40dp_material</item>

        <item name="minWidth">56dp</item>

        <item name="scaleType">center</item>

        <item name="paddingStart">@dimen/action_bar_navigation_padding_start_material</item>

    </style>



    <style name="Widget.Material.WebTextView" parent="Widget.WebTextView"/>