From 2a15981dd8aec4fea6128eaf2cc63bd06f8acef0 Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Thu, 26 Jan 2023 14:54:17 +0000
Subject: [PATCH] Directly update the lock icon background color

Previously we were retrieving a new drawable resource
everytime we wanted to update the color, but this
was not updating the displayed color.

Fixes: 253643507
Test: manual
Change-Id: I6e2e0c2cfd02dbefb74f00ff8c168fdc9b60dc78
---
 packages/SystemUI/res/layout/status_bar_expanded.xml         | 2 +-
 packages/SystemUI/src/com/android/keyguard/LockIconView.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml
index 159323a5b557b..b62c36f9b52b6 100644
--- a/packages/SystemUI/res/layout/status_bar_expanded.xml
+++ b/packages/SystemUI/res/layout/status_bar_expanded.xml
@@ -136,7 +136,7 @@
             android:id="@+id/lock_icon_bg"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/fingerprint_bg"
+            android:src="@drawable/fingerprint_bg"
             android:visibility="invisible"/>
 
         <ImageView
diff --git a/packages/SystemUI/src/com/android/keyguard/LockIconView.java b/packages/SystemUI/src/com/android/keyguard/LockIconView.java
index 34a5ef75f1769..abad0be637cab 100644
--- a/packages/SystemUI/src/com/android/keyguard/LockIconView.java
+++ b/packages/SystemUI/src/com/android/keyguard/LockIconView.java
@@ -88,7 +88,9 @@ public class LockIconView extends FrameLayout implements Dumpable {
                     Utils.getColorAttrDefaultColor(getContext(), android.R.attr.textColorPrimary),
                     Color.WHITE,
                     mDozeAmount);
-            mBgView.setBackground(getContext().getDrawable(R.drawable.fingerprint_bg));
+            int backgroundColor = Utils.getColorAttrDefaultColor(getContext(),
+                    com.android.internal.R.attr.colorSurface);
+            mBgView.setImageTintList(ColorStateList.valueOf(backgroundColor));
             mBgView.setAlpha(1f - mDozeAmount);
             mBgView.setVisibility(View.VISIBLE);
         } else {