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

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

Merge "Update action bar insets on sw600dp to match Material spec" into lmp-mr1-dev

parents 662039c6 3c9012b9

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

+6 −0
Original line number Diff line number Diff line
@@ -23,5 +23,11 @@ 
    <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>

</resources>

core/res/res/values/dimens_material.xml

+13 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 
    <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 content inset of an action bar. -->

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

    <!-- Vertical padding around action bar icons. -->

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

    <!-- Top margin for action bar subtitles -->
@@ -44,6 +46,17 @@ 
    <!-- Bottom margin for action bar subtitles -->

    <dimen name="action_bar_subtitle_bottom_margin_material">5dp</dimen>



    <!-- Default padding for list items. This should match the action bar

         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. -->

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



    <dimen name="action_button_min_width_overflow_material">36dp</dimen>

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

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

core/res/res/values/styles_material.xml

+7 −5
Original line number Diff line number Diff line
@@ -815,6 +815,7 @@ please see styles_device_defaults.xml. 


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

        <item name="background">?attr/selectableItemBackgroundBorderless</item>

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

    </style>



    <style name="Widget.Material.WebTextView" parent="Widget.WebTextView"/>
@@ -874,8 +875,8 @@ please see styles_device_defaults.xml. 
        <item name="contentDescription">@string/action_menu_overflow_description</item>

        <item name="minWidth">@dimen/action_button_min_width_overflow_material</item>

        <item name="minHeight">@dimen/action_button_min_height_material</item>

        <item name="paddingStart">6dp</item>

        <item name="paddingEnd">10dp</item>

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

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

    </style>



    <style name="Widget.Material.ActionBar.TabView" parent="Widget.ActionBar.TabView">
@@ -910,11 +911,12 @@ please see styles_device_defaults.xml. 
        <item name="subtitleTextStyle">@style/TextAppearance.Material.Widget.ActionBar.Subtitle</item>

        <item name="progressBarStyle">?attr/progressBarStyleHorizontal</item>

        <item name="indeterminateProgressStyle">?attr/progressBarStyle</item>

        <item name="progressBarPadding">32dip</item>

        <item name="itemPadding">8dip</item>

        <item name="progressBarPadding">32dp</item>

        <item name="itemPadding">8dp</item>

        <item name="homeLayout">@layout/action_bar_home_material</item>

        <item name="gravity">center_vertical</item>

        <item name="contentInsetStart">16dp</item>

        <item name="contentInsetStart">@dimen/action_bar_content_inset_material</item>

        <item name="contentInsetEnd">@dimen/action_bar_content_inset_material</item>

        <item name="elevation">8dp</item>

        <item name="popupTheme">?attr/actionBarPopupTheme</item>

    </style>

core/res/res/values/themes_material.xml

+8 −8
Original line number Diff line number Diff line
@@ -115,10 +115,10 @@ please see themes_device_defaults.xml. 
        <item name="textAppearanceListItem">@style/TextAppearance.Material.Subhead</item>

        <item name="textAppearanceListItemSmall">@style/TextAppearance.Material.Subhead</item>

        <item name="textAppearanceListItemSecondary">@style/TextAppearance.Material.Body1</item>

        <item name="listPreferredItemPaddingLeft">16dip</item>

        <item name="listPreferredItemPaddingRight">16dip</item>

        <item name="listPreferredItemPaddingStart">16dip</item>

        <item name="listPreferredItemPaddingEnd">16dip</item>

        <item name="listPreferredItemPaddingLeft">@dimen/list_item_padding_horizontal_material</item>

        <item name="listPreferredItemPaddingRight">@dimen/list_item_padding_horizontal_material</item>

        <item name="listPreferredItemPaddingStart">@dimen/list_item_padding_horizontal_material</item>

        <item name="listPreferredItemPaddingEnd">@dimen/list_item_padding_horizontal_material</item>



        <!-- @hide -->

        <item name="searchResultListItemHeight">58dip</item>
@@ -467,10 +467,10 @@ please see themes_device_defaults.xml. 
        <item name="textAppearanceListItem">@style/TextAppearance.Material.Subhead</item>

        <item name="textAppearanceListItemSmall">@style/TextAppearance.Material.Subhead</item>

        <item name="textAppearanceListItemSecondary">@style/TextAppearance.Material.Body1</item>

        <item name="listPreferredItemPaddingLeft">16dip</item>

        <item name="listPreferredItemPaddingRight">16dip</item>

        <item name="listPreferredItemPaddingStart">16dip</item>

        <item name="listPreferredItemPaddingEnd">16dip</item>

        <item name="listPreferredItemPaddingLeft">@dimen/list_item_padding_horizontal_material</item>

        <item name="listPreferredItemPaddingRight">@dimen/list_item_padding_horizontal_material</item>

        <item name="listPreferredItemPaddingStart">@dimen/list_item_padding_horizontal_material</item>

        <item name="listPreferredItemPaddingEnd">@dimen/list_item_padding_horizontal_material</item>



        <!-- @hide -->

        <item name="searchResultListItemHeight">58dip</item>