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

Commit 44495256 authored by Hai Zhang's avatar Hai Zhang
Browse files

[Expressive design] Update background color for v36 and expressive 

Note that it is fine to update v36 now without go/pr-bug because
the non-compatible ag/31875335 is already in 25Q2 system image.

This is a continuation of the reverted ag/33040938 in a backwards
compatible way, in that it updates the background color for v36 but
keeps v31-v35 and expressive unchanged.

Bug: 408996309
Test: manual
Flag: EXEMPT style update
Change-Id: Ia671066ef7c8a282c8194bd9731a5e6a1943f40c
parent 4024108c

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

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
        <item name="switchStyle">@style/SwitchCompat.SettingsLib</item>

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

        <item name="android:listDivider">@drawable/settingslib_list_divider</item>

        <item name="android:colorBackground">@color/settingslib_materialColorSurfaceContainerLowest</item>

    </style>



    <style name="Theme.SettingsBase" parent="Theme.SettingsBase_v31" />

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

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<resources>

    <style name="Theme.SettingsBase_v36" parent="Theme.SettingsBase_v33" >

        <item name="android:colorAccent">@color/settingslib_materialColorPrimary</item>

        <item name="android:colorBackground">@color/settingslib_materialColorSurfaceContainer</item>

        <item name="android:colorBackground">@color/settingslib_materialColorSurfaceContainerLowest</item>

        <item name="android:textColorPrimary">@color/settingslib_materialColorOnSurface</item>

        <item name="android:textColorSecondary">@color/settingslib_text_color_secondary</item>

        <item name="android:textColorTertiary">@color/settingslib_materialColorOutline</item>

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

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 


<resources>

    <style name="Theme.SettingsBase.Expressive">

        <!-- Set up background color -->

        <item name="android:colorBackground">@color/settingslib_materialColorSurfaceContainer</item>



        <!-- Set up Preference title text style -->

        <item name="android:textAppearanceListItem">@style/TextAppearance.SettingsLib.PreferenceTitle</item>

        <item name="android:textAppearanceListItemSecondary">@style/TextAppearance.SettingsLib.PreferenceSummary</item>