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

Commit 81f31184 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Tweak SettingsTheme" into sc-dev am: d5d2857c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14099059

Change-Id: Ib13a2f92bc5ac05198cdc604dfa578c92666a7c0
parents ff0a99fe d5d2857c

packages/SettingsLib/SettingsTheme/res/values-v31/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    <dimen name="preference_title_font_size">20sp</dimen>

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

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

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

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

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

    <dimen name="app_icon_min_width">52dp</dimen>

</resources>

packages/SettingsLib/SettingsTheme/res/values/styles_preference.xml

+13 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
  limitations under the License.

  -->

<resources>

    <!--DEPRECATED. It will remove after all of client team migrated to new style. -->

    <style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay">

        <item name="preferenceCategoryStyle">@style/SettingsCategoryPreference</item>

        <item name="preferenceStyle">@style/SettingsPreference</item>
@@ -27,6 +28,18 @@ 
        <item name="footerPreferenceStyle">@style/Preference.Material</item>

    </style>



    <style name="SettingsPreferenceTheme" parent="@style/PreferenceThemeOverlay">

        <item name="preferenceCategoryStyle">@style/SettingsCategoryPreference</item>

        <item name="preferenceStyle">@style/SettingsPreference</item>

        <item name="checkBoxPreferenceStyle">@style/SettingsCheckBoxPreference</item>

        <item name="dialogPreferenceStyle">@style/SettingsPreference</item>

        <item name="editTextPreferenceStyle">@style/SettingsEditTextPreference</item>

        <item name="dropdownPreferenceStyle">@style/SettingsDropdownPreference</item>

        <item name="switchPreferenceStyle">@style/SettingsSwitchPreference</item>

        <item name="seekBarPreferenceStyle">@style/SettingsSeekbarPreference</item>

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

    </style>



    <style name="SettingsCategoryPreference" parent="@style/Preference.Category.Material">

        <item name="iconSpaceReserved">@bool/config_icon_space_reserved</item>

        <item name="allowDividerAbove">@bool/config_allow_divider</item>

packages/SettingsLib/SettingsTheme/res/values/themes.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
        <item name="android:textAppearanceListItem">@style/TextAppearance.PreferenceTitle</item>

        <item name="android:listPreferredItemPaddingStart">@dimen/preference_padding_start</item>

        <item name="android:listPreferredItemPaddingEnd">@dimen/preference_padding_end</item>

        <item name="preferenceTheme">@style/PreferenceTheme</item>

        <item name="preferenceTheme">@style/SettingsPreferenceTheme</item>

    </style>



    <!-- Using in SubSettings page including injected settings page -->