From 12241c35be07a117652e74f623c349a54458f820 Mon Sep 17 00:00:00 2001
From: Grace Cheng <graciecheng@google.com>
Date: Wed, 3 May 2023 21:36:01 +0000
Subject: Fix regression from ag/22534576

Gate changes from ag/22534576 on isSfps check until BiometricPrompt
refactor into View-ViewBinder-ViewModel structure is complete for
non-sfps logic

Test: Ensure correct icon is displayed in BP on non-sfps device
Fixes: 280494848
Change-Id: I3d2d1434e7090153ff938ed3553d6766436e1814
---
 .../com/android/systemui/biometrics/AuthBiometricFingerprintView.kt  | 5 +++++
 .../biometrics/ui/binder/AuthBiometricFingerprintViewBinder.kt       | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintView.kt b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintView.kt
index 20666344ade8..f2e47018bf4e 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintView.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintView.kt
@@ -31,6 +31,10 @@ open class AuthBiometricFingerprintView(
     context: Context,
     attrs: AttributeSet? = null
 ) : AuthBiometricView(context, attrs) {
+    /** If this view is for a SFPS sensor.  */
+    var isSfps = false
+        private set
+
     /** If this view is for a UDFPS sensor.  */
     var isUdfps = false
         private set
@@ -40,6 +44,7 @@ open class AuthBiometricFingerprintView(
 
     /** Set the [sensorProps] of this sensor so the view can be customized prior to layout. */
     fun setSensorProperties(sensorProps: FingerprintSensorPropertiesInternal) {
+        isSfps = sensorProps.isAnySidefpsType
         isUdfps = sensorProps.isAnyUdfpsType
         udfpsAdapter = if (isUdfps) UdfpsDialogMeasureAdapter(this, sensorProps) else null
     }
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/AuthBiometricFingerprintViewBinder.kt b/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/AuthBiometricFingerprintViewBinder.kt
index e776ab44ee42..ae0cf3771ed3 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/AuthBiometricFingerprintViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/AuthBiometricFingerprintViewBinder.kt
@@ -36,7 +36,9 @@ object AuthBiometricFingerprintViewBinder {
                 viewModel.setRotation(view.context.display?.orientation ?: Surface.ROTATION_0)
                 launch {
                     viewModel.iconAsset.collect { iconAsset ->
-                        view.updateIconViewAnimation(iconAsset)
+                        if (view.isSfps) {
+                            view.updateIconViewAnimation(iconAsset)
+                        }
                     }
                 }
             }
-- 
cgit v1.2.3-59-g8ed1b