From 4a661b75e6b415c5a7414723e336111382f93f42 Mon Sep 17 00:00:00 2001
From: Brad Hinegardner <bhinegardner@google.com>
Date: Fri, 30 Jun 2023 19:48:43 +0000
Subject: [PATCH] Update lockscreen shortcuts color tokens

Use the proper colors for the lockscreen shortcuts

Fixes: 287072561
Fixes: 290316219
Test: manual - toggle shortcut on and off in light mode, verify correct colors
Test: manual - toggle shortcut on and off in dark mode, verify correct colors
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e72e9467fd0be5819993bf23ba9decdb1f6c3df)
Merged-In: I17a5444d6c21b9a109b6c9a308d367a4503f5fdc
Change-Id: I17a5444d6c21b9a109b6c9a308d367a4503f5fdc
---
 .../res/drawable/keyguard_bottom_affordance_bg.xml        | 2 +-
 .../keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/SystemUI/res/drawable/keyguard_bottom_affordance_bg.xml b/packages/SystemUI/res/drawable/keyguard_bottom_affordance_bg.xml
index 87b5a4c2fc5b5..32dc4b335f7ec 100644
--- a/packages/SystemUI/res/drawable/keyguard_bottom_affordance_bg.xml
+++ b/packages/SystemUI/res/drawable/keyguard_bottom_affordance_bg.xml
@@ -20,7 +20,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     android:shape="rectangle">
-  <solid android:color="?androidprv:attr/colorSurface"/>
+  <solid android:color="?androidprv:attr/materialColorSurfaceContainerHigh"/>
   <size
       android:width="@dimen/keyguard_affordance_fixed_width"
       android:height="@dimen/keyguard_affordance_fixed_height"/>
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt
index a8d662c962849..5ad6e5196f662 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt
@@ -377,9 +377,9 @@ object KeyguardBottomAreaViewBinder {
             Utils.getColorAttrDefaultColor(
                 view.context,
                 if (viewModel.isActivated) {
-                    com.android.internal.R.attr.textColorPrimaryInverse
+                    com.android.internal.R.attr.materialColorOnPrimaryFixed
                 } else {
-                    com.android.internal.R.attr.textColorPrimary
+                    com.android.internal.R.attr.materialColorOnSurface
                 },
             )
         )
@@ -389,9 +389,9 @@ object KeyguardBottomAreaViewBinder {
                 Utils.getColorAttr(
                     view.context,
                     if (viewModel.isActivated) {
-                        com.android.internal.R.attr.colorAccentPrimary
+                        com.android.internal.R.attr.materialColorPrimaryFixed
                     } else {
-                        com.android.internal.R.attr.colorSurface
+                        com.android.internal.R.attr.materialColorSurfaceContainerHigh
                     }
                 )
             } else {