Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix colors in QS to match new scrim

Browse Source 
* 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
This commit is contained in:
Fabian Kozynski
2020-12-09 11:40:30 -05:00
parent 83eeb33c2f
commit 80242a0c11
7 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/drawable/brightness_mirror_background.xml
View File

@@ -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>

2
packages/SystemUI/res/drawable/qs_customizer_background_primary.xml
View File

@@ -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>

2
packages/SystemUI/res/drawable/qs_customizer_toolbar.xml
View File

@@ -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" />

2
packages/SystemUI/res/drawable/qs_detail_background.xml
View File

@@ -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>

5
packages/SystemUI/res/values-night/colors.xml
View File

@@ -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>

3
packages/SystemUI/res/values/colors.xml
View File

@@ -35,8 +35,7 @@
<color name="status_bar_clock_color">#FFFFFFFF</color>
<color name="qs_user_detail_icon_muted">#FFFFFFFF</color> <!-- not so muted after all -->
<color name="qs_tile_disabled_color">#9E9E9E</color> <!-- 38% black -->
<color name="qs_customize_background">@color/GM2_grey_50</color>
<color name="qs_customize_decoration">@color/GM2_grey_100</color>
<color name="qs_customize_decoration">@color/GM2_grey_300</color>
<!-- The color of the background in the separated list of the Global Actions menu -->
<color name="global_actions_separated_background">#F5F5F5</color>

2
packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileBaseView.java
View File

@@ -133,7 +133,7 @@ public class QSTileBaseView extends com.android.systemui.plugins.qs.QSTileView {
mColorActive = Utils.getColorAttrDefaultColor(context, android.R.attr.colorAccent);
mColorDisabled = Utils.getDisabled(context,
Utils.getColorAttrDefaultColor(context, android.R.attr.textColorTertiary));
Utils.getColorAttrDefaultColor(context, android.R.attr.colorControlActivated));
mColorInactive = Utils.getColorAttrDefaultColor(context, android.R.attr.textColorSecondary);
setPadding(0, 0, 0, 0);