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

Commit 2b3818e9 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix bug #15414236 Define a framework theme for system settings"

parents 24683f1e fb82d483

core/res/res/values/dimens_material.xml

+5 −0
Original line number Diff line number Diff line
@@ -15,6 +15,11 @@ 
-->

<resources>



    <!-- Preference fragment padding, sides -->

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



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



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

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

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

core/res/res/values/styles_material.xml

+34 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ please see styles_device_defaults.xml. 
    </style>



    <style name="PreferenceFragment.Material">

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

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

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

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

    </style>



    <style name="Preference.Material.Information">
@@ -86,6 +86,38 @@ please see styles_device_defaults.xml. 
        <item name="showDefault">true</item>

    </style>



    <!-- No margins or background by default. Could be different for x-large screens -->

    <style name="PreferencePanel.Material">

    </style>



    <!-- The attributes are overridden here because the x-large or large resources may have

         changed the margins and background in the parent PreferencePanel style. -->

    <style name="PreferencePanel.Material.Dialog">

        <item name="layout_marginStart">0dip</item>

        <item name="layout_marginEnd">0dip</item>

        <item name="layout_marginTop">0dip</item>

        <item name="layout_marginBottom">0dip</item>

        <item name="background">@null</item>

    </style>



    <style name="PreferenceHeaderPanel.Material">

        <item name="layout_marginStart">@dimen/preference_screen_side_margin</item>

        <item name="layout_marginEnd">@dimen/preference_screen_side_margin_negative</item>

        <item name="paddingTop">@dimen/preference_screen_header_vertical_padding</item>

        <item name="paddingBottom">@dimen/preference_screen_header_vertical_padding</item>

    </style>



    <style name="PreferenceHeaderList.Material">

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

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

        <item name="scrollbarStyle">@integer/preference_screen_header_scrollbarStyle</item>

    </style>



    <style name="PreferenceFragmentList.Material">

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

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

    </style>



    <!-- Begin Material theme styles -->



    <!-- Text styles -->

core/res/res/values/themes_material.xml

+10 −2
Original line number Diff line number Diff line
@@ -277,7 +277,6 @@ please see themes_device_defaults.xml. 
        <!-- Preference styles -->

        <item name="preferenceScreenStyle">@style/Preference.Material.PreferenceScreen</item>

        <item name="preferenceFragmentStyle">@style/PreferenceFragment.Material</item>

        <item name="preferenceFragmentPaddingSide">0dip</item>

        <item name="preferenceCategoryStyle">@style/Preference.Material.Category</item>

        <item name="preferenceStyle">@style/Preference.Material</item>

        <item name="preferenceInformationStyle">@style/Preference.Material.Information</item>
@@ -288,6 +287,11 @@ please see themes_device_defaults.xml. 
        <item name="editTextPreferenceStyle">@style/Preference.Material.DialogPreference.EditTextPreference</item>

        <item name="ringtonePreferenceStyle">@style/Preference.Material.RingtonePreference</item>

        <item name="preferenceLayoutChild">@layout/preference_child_material</item>

        <item name="preferencePanelStyle">@style/PreferencePanel.Material</item>

        <item name="preferenceHeaderPanelStyle">@style/PreferenceHeaderPanel.Material</item>

        <item name="preferenceListStyle">@style/PreferenceHeaderList.Material</item>

        <item name="preferenceFragmentListStyle">@style/PreferenceFragmentList.Material</item>

        <item name="preferenceFragmentPaddingSide">@dimen/preference_fragment_padding_side_material</item>

        <item name="detailsElementBackground">?attr/colorBackground</item>



        <!-- Search widget styles -->
@@ -625,7 +629,6 @@ please see themes_device_defaults.xml. 
        <!-- Preference styles -->

        <item name="preferenceScreenStyle">@style/Preference.Material.PreferenceScreen</item>

        <item name="preferenceFragmentStyle">@style/PreferenceFragment.Material</item>

        <item name="preferenceFragmentPaddingSide">0dip</item>

        <item name="preferenceCategoryStyle">@style/Preference.Material.Category</item>

        <item name="preferenceStyle">@style/Preference.Material</item>

        <item name="preferenceInformationStyle">@style/Preference.Material.Information</item>
@@ -636,6 +639,11 @@ please see themes_device_defaults.xml. 
        <item name="editTextPreferenceStyle">@style/Preference.Material.DialogPreference.EditTextPreference</item>

        <item name="ringtonePreferenceStyle">@style/Preference.Material.RingtonePreference</item>

        <item name="preferenceLayoutChild">@layout/preference_child_material</item>

        <item name="preferencePanelStyle">@style/PreferencePanel.Material</item>

        <item name="preferenceHeaderPanelStyle">@style/PreferenceHeaderPanel.Material</item>

        <item name="preferenceListStyle">@style/PreferenceHeaderList.Material</item>

        <item name="preferenceFragmentListStyle">@style/PreferenceFragmentList.Material</item>

        <item name="preferenceFragmentPaddingSide">@dimen/preference_fragment_padding_side_material</item>

        <item name="detailsElementBackground">?attr/colorBackground</item>



        <!-- PreferenceFrameLayout attributes -->