Merge "Fix regression from ag/22534576" into udc-dev (1b25aefa) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintView.kt

+5 −0

Original line number	Diff line number	Diff line
		@@ -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
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ object AuthBiometricFingerprintViewBinder {
		viewModel.setRotation(view.context.display?.orientation ?: Surface.ROTATION_0)
		launch {
		viewModel.iconAsset.collect { iconAsset ->
		if (view.isSfps) {
		view.updateIconViewAnimation(iconAsset)
		}
		}
		@@ -43,3 +44,4 @@ object AuthBiometricFingerprintViewBinder {
		}
		}
		}
		}