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

Commit 583d1382 authored by Yi-an Chen's avatar Yi-an Chen
Browse files

Fix missing style for category preference in SUW 

The usage of settingslib_expressive_preference_category in SUW only has
these themes:

* PreferenceTheme.SettingsLib.Expressive
* SudThemeGlifExpressive.DayNight
* SetupWizardPartnerResource
* SettingsPreferenceTheme.SetupWizard.Expressive
* Theme.Settings
* Theme.DeviceDefault.Light.DarkActionBar

I searched the usage of settingslib_expressive_preference_icon_frame and
it's only used by *_expressive_* layouts. Hence adding these styles to
PreferenceTheme.SettingsLib.Expressive instead of PreferenceTheme.SettingsLib

Bug: 434590559
Test: Manually using SUW
Flag: EXEMPT bugfix
Change-Id: Idfdd483197fdbc341ae923c28adae0d21ffa38f1
parent 754642f2

packages/SettingsLib/SettingsTheme/res/values-v36/themes_expressive.xml

+0 −11
Original line number Diff line number Diff line
@@ -45,17 +45,6 @@ 


        <!-- For Expressive Switch -->

        <item name="expressiveSwitchStyle">@style/SettingslibSwitchStyle.Expressive</item>



        <!-- Expressive Design: overridable styles/themes for Preferences -->

        <item name="expressivePreferenceTheme">@style/ExpressivePreferenceTheme</item>

        <item name="expressivePreferenceIconFrameStyle">@style/ExpressivePreferenceIconFrameStyle</item>

        <item name="expressivePreferenceIconStyle">@style/ExpressivePreferenceIconStyle</item>

        <item name="expressivePreferenceTextFrameStyle">@style/ExpressivePreferenceTextFrameStyle</item>

        <item name="expressivePreferenceTextFrameTitleStyle">@style/ExpressivePreferenceTextFrameTitleStyle</item>

        <item name="expressivePreferenceTextFrameSummaryStyle">@style/ExpressivePreferenceTextFrameSummaryStyle</item>

        <item name="expressiveTwoTargetDividerStyle">@style/ExpressiveTwoTargetDividerStyle</item>

        <item name="expressiveTwoTargetDividerImageViewStyle">@style/ExpressiveTwoTargetDividerImageViewStyle</item>

        <item name="expressiveTwoTargetDividerViewStyle">@style/ExpressiveTwoTargetDividerViewStyle</item>

    </style>



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

packages/SettingsLib/SettingsTheme/res/values-v36/themes_preference_expressive.xml

+12 −1
Original line number Diff line number Diff line
@@ -28,5 +28,16 @@ 
        <item name="switchPreferenceCompatStyle">@style/SettingsLibPreference.SwitchPreferenceCompat.Expressive</item>

        <item name="preferenceCategoryTitleTextAppearance">@style/TextAppearance.CategoryTitle.SettingsLib</item>

        <item name="preferenceCategoryTitleTextColor">@color/settingslib_materialColorPrimary</item>



        <!-- Expressive Design: overridable styles/themes for Preferences -->

        <item name="expressivePreferenceTheme">@style/ExpressivePreferenceTheme</item>

        <item name="expressivePreferenceIconFrameStyle">@style/ExpressivePreferenceIconFrameStyle</item>

        <item name="expressivePreferenceIconStyle">@style/ExpressivePreferenceIconStyle</item>

        <item name="expressivePreferenceTextFrameStyle">@style/ExpressivePreferenceTextFrameStyle</item>

        <item name="expressivePreferenceTextFrameTitleStyle">@style/ExpressivePreferenceTextFrameTitleStyle</item>

        <item name="expressivePreferenceTextFrameSummaryStyle">@style/ExpressivePreferenceTextFrameSummaryStyle</item>

        <item name="expressiveTwoTargetDividerStyle">@style/ExpressiveTwoTargetDividerStyle</item>

        <item name="expressiveTwoTargetDividerImageViewStyle">@style/ExpressiveTwoTargetDividerImageViewStyle</item>

        <item name="expressiveTwoTargetDividerViewStyle">@style/ExpressiveTwoTargetDividerViewStyle</item>

    </style>

</resources>