Merge "Fix regression from ag/22534576" into udc-dev

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
     }

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)
+                        }
                     }
                 }
             }