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

Commit 80242a0c authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Fix colors in QS to match new scrim 

* QS Customizer background and toolbar
* QS Detail background

Also, change background of INACTIVE/DISABLED tiles to have better
contrast.

Test: manual
Bug: 173562510
Change-Id: Idc13354415568148f4dbd1475f02d6a0ca5b74db
parent 83eeb33c

packages/SystemUI/res/drawable/brightness_mirror_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ 
  ~ limitations under the License

  -->

<shape xmlns:android="http://schemas.android.com/apk/res/android">

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

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

    <corners android:radius="8dp" />

</shape>

packages/SystemUI/res/drawable/qs_customizer_background_primary.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->

<inset xmlns:android="http://schemas.android.com/apk/res/android">

    <shape>

        <solid android:color="@color/qs_customize_background"/>

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

        <corners android:radius="?android:attr/dialogCornerRadius" />

    </shape>

</inset>

packages/SystemUI/res/drawable/qs_customizer_toolbar.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->

<inset xmlns:android="http://schemas.android.com/apk/res/android">

    <shape>

        <solid android:color="@color/qs_customize_background"/>

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

        <corners

            android:topLeftRadius="?android:attr/dialogCornerRadius"

            android:topRightRadius="?android:attr/dialogCornerRadius" />

packages/SystemUI/res/drawable/qs_detail_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ Copyright (C) 2014 The Android Open Source Project 
    <item>

        <inset>

            <shape>

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

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

                <corners android:radius="?android:attr/dialogCornerRadius" />

            </shape>

        </inset>

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

+1 −4
Original line number Diff line number Diff line
@@ -44,11 +44,8 @@ 
    <color name="notification_section_clear_all_btn_color">@color/GM2_grey_500</color>

    <color name="notification_channel_dialog_separator">@color/GM2_grey_700</color>



    <!-- The color of the background in the top part of QSCustomizer -->

    <color name="qs_customize_background">@color/GM2_grey_900</color>



    <!-- The color of the background in the bottom part of QSCustomizer -->

    <color name="qs_customize_decoration">@color/GM2_grey_800</color>

    <color name="qs_customize_decoration">@color/GM2_grey_900</color>



    <!-- The color of the background in the separated list of the Global Actions menu -->

    <color name="global_actions_separated_background">@color/GM2_grey_900</color>