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

Commit 3e99d176 authored by Danny Lin's avatar Danny Lin Committed by Bruno Martins
Browse files

SystemUI: Follow light/dark theme in quick settings 

Android 12's dual-tone style where the quick settings panel is always
dark makes the light theme look like a second-class citizen. Pure black
also looks out-of-place next to QS tiles and the notification panel
because dynamic themes don't affect it at all.

Revert to the ~Beta 1 style where quick settings used the same theme as
the notification shade.

- colorAccentPrimary has been replaced with colorAccent for contrast in
  light mode, because colorAccentPrimary is system_accent1_100 (dark
  accent color)
- Footer chips have been converted to surfaces (similar to QS tiles and
  notifications), which makes more sense with the new style
- The QS background is now the same as the notification shade background
  in both light and dark modes

Demo screenshots (with dual-tone commit):
https://twitter.com/kdrag0n/status/1445922541218922496

[kdrag0n: ported to 12L]

Change-Id: I3d45b72f0f119e100505409d178ab8f698993881
parent 1b62ea8b

packages/SystemUI/res/drawable/brightness_progress_full_drawable.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
        android:height="@dimen/rounded_slider_height">

        <shape>

            <size android:height="@dimen/rounded_slider_height" />

            <solid android:color="?priv-android:attr/colorAccentPrimary" />

            <solid android:color="?android:attr/colorAccent" />

            <corners android:radius="@dimen/rounded_slider_corner_radius"/>

        </shape>

    </item>

packages/SystemUI/res/drawable/qs_footer_action_chip_background.xml

+1 −7
Original line number Diff line number Diff line
@@ -28,13 +28,7 @@ 
        </item>

        <item>

            <shape android:shape="rectangle">

                <solid android:color="?attr/underSurfaceColor"/>

                <corners android:radius="@dimen/qs_footer_action_corner_radius"/>

            </shape>

        </item>

        <item>

            <shape android:shape="rectangle">

                <stroke android:width="1dp" android:color="?android:attr/colorBackground"/>

                <solid android:color="?attr/offStateColor"/>

                <corners android:radius="@dimen/qs_footer_action_corner_radius"/>

            </shape>

        </item>

packages/SystemUI/res/drawable/qs_security_footer_background.xml

+1 −2
Original line number Diff line number Diff line
@@ -28,8 +28,7 @@ 
        </item>

        <item>

            <shape android:shape="rectangle">

                <stroke android:width="1dp"

                        android:color="?android:attr/colorBackground"/>

                <solid android:color="?attr/offStateColor"/>

                <corners android:radius="@dimen/qs_security_footer_corner_radius"/>

            </shape>

        </item>

packages/SystemUI/res/values-night/styles.xml

+12 −0
Original line number Diff line number Diff line
@@ -24,6 +24,18 @@ 
        <item name="android:windowIsFloating">true</item>

    </style>



    <style name="Theme.SystemUI.QuickSettings" parent="@*android:style/Theme.DeviceDefault.SystemUI">

        <item name="lightIconTheme">@style/QSIconTheme</item>

        <item name="darkIconTheme">@style/QSIconTheme</item>

        <item name="android:colorError">@*android:color/error_color_material_dark</item>

        <item name="android:windowIsFloating">true</item>

        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>

        <item name="offStateColor">@android:color/system_neutral1_800</item>

        <item name="underSurfaceColor">@android:color/system_neutral1_900</item>

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

        <item name="android:itemTextAppearance">@style/Control.MenuItem</item>

    </style>



    <style name="TextAppearance.QS.Status" parent="TextAppearance.QS.TileLabel.Secondary">

        <item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

packages/SystemUI/res/values/styles.xml

+5 −5
Original line number Diff line number Diff line
@@ -329,12 +329,12 @@ 
    <style name="Theme.SystemUI.QuickSettings" parent="@*android:style/Theme.DeviceDefault.SystemUI">

        <item name="lightIconTheme">@style/QSIconTheme</item>

        <item name="darkIconTheme">@style/QSIconTheme</item>

        <item name="android:colorError">@*android:color/error_color_material_dark</item>

        <item name="android:colorError">@*android:color/error_color_material_light</item>

        <item name="android:windowIsFloating">true</item>

        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>

        <item name="offStateColor">@android:color/system_neutral1_800</item>

        <item name="underSurfaceColor">@android:color/system_neutral1_1000</item>

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

        <item name="offStateColor">@*android:color/surface_light</item>

        <item name="underSurfaceColor">@android:color/system_neutral1_50</item>

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

        <item name="android:itemTextAppearance">@style/Control.MenuItem</item>

    </style>
@@ -540,7 +540,7 @@ 


    <style name="QSCustomizeToolbar" parent="@*android:style/Widget.DeviceDefault.Toolbar">

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:elevation">10dp</item>

        <item name="android:elevation">0dp</item>

    </style>



    <!-- Media controls always have light background -->