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

Commit ae6847b6 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Set style for SwitchPreferenceCompat 

Same as SwitchPreference.

Bug: 306658427
Test: manual - on Mobile Settings
Change-Id: I5b01165b3af2cb5274584e6f96ed870885a2c4d7
parent c91700a7

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

+6 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
        <item name="editTextPreferenceStyle">@style/SettingsEditTextPreference.SettingsLib</item>

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

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

        <item name="switchPreferenceCompatStyle">@style/SettingsSwitchPreferenceCompat.SettingsLib</item>

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

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

    </style>
@@ -67,6 +68,11 @@ 
        <item name="iconSpaceReserved">@bool/settingslib_config_icon_space_reserved</item>

    </style>



    <style name="SettingsSwitchPreferenceCompat.SettingsLib" parent="@style/Preference.SwitchPreferenceCompat.Material">

        <item name="layout">@layout/settingslib_preference</item>

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

    </style>



    <style name="SettingsSeekbarPreference.SettingsLib" parent="@style/Preference.SeekBarPreference.Material">

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

    </style>

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

+6 −1
Original line number Diff line number Diff line
@@ -34,12 +34,17 @@ 
    </style>



    <style name="Switch.SettingsLib" parent="@android:style/Widget.Material.CompoundButton.Switch">

        <item name="android:switchMinWidth">52dp</item>

        <item name="android:minHeight">@dimen/settingslib_preferred_minimum_touch_target</item>

        <item name="android:track">@drawable/settingslib_switch_track</item>

        <item name="android:thumb">@drawable/settingslib_switch_thumb</item>

    </style>



    <style name="SwitchCompat.SettingsLib" parent="@style/Widget.AppCompat.CompoundButton.Switch">

        <item name="android:minHeight">@dimen/settingslib_preferred_minimum_touch_target</item>

        <item name="track">@drawable/settingslib_switch_track</item>

        <item name="android:thumb">@drawable/settingslib_switch_thumb</item>

    </style>



    <style name="HorizontalProgressBar.SettingsLib"

           parent="android:style/Widget.Material.ProgressBar.Horizontal">

        <item name="android:progressDrawable">@drawable/settingslib_progress_horizontal</item>

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

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
        <item name="android:listPreferredItemPaddingRight">16dp</item>

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

        <item name="android:switchStyle">@style/Switch.SettingsLib</item>

        <item name="switchStyle">@style/SwitchCompat.SettingsLib</item>

        <item name="android:progressBarStyleHorizontal">@style/HorizontalProgressBar.SettingsLib</item>

    </style>