Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Grace Cheng
2023-05-04 06:17:12 +00:00
committed by Android (Google) Code Review
parent 1840acdefa 12241c35be
commit 1b25aefad3
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricFingerprintView.kt
View File

@@ -31,6 +31,10 @@ open class AuthBiometricFingerprintView(
context: Context, context: Context,
attrs: AttributeSet? = null attrs: AttributeSet? = null
) : AuthBiometricView(context, attrs) { ) : AuthBiometricView(context, attrs) {
/** If this view is for a SFPS sensor. */
var isSfps = false
private set
/** If this view is for a UDFPS sensor. */ /** If this view is for a UDFPS sensor. */
var isUdfps = false var isUdfps = false
private set private set
@@ -40,6 +44,7 @@ open class AuthBiometricFingerprintView(
/** Set the [sensorProps] of this sensor so the view can be customized prior to layout. */ /** Set the [sensorProps] of this sensor so the view can be customized prior to layout. */
fun setSensorProperties(sensorProps: FingerprintSensorPropertiesInternal) { fun setSensorProperties(sensorProps: FingerprintSensorPropertiesInternal) {
isSfps = sensorProps.isAnySidefpsType
isUdfps = sensorProps.isAnyUdfpsType isUdfps = sensorProps.isAnyUdfpsType
udfpsAdapter = if (isUdfps) UdfpsDialogMeasureAdapter(this, sensorProps) else null udfpsAdapter = if (isUdfps) UdfpsDialogMeasureAdapter(this, sensorProps) else null
} }

4
packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/AuthBiometricFingerprintViewBinder.kt
View File

@@ -36,7 +36,9 @@ object AuthBiometricFingerprintViewBinder {
viewModel.setRotation(view.context.display?.orientation ?: Surface.ROTATION_0) viewModel.setRotation(view.context.display?.orientation ?: Surface.ROTATION_0)
launch { launch {
viewModel.iconAsset.collect { iconAsset -> viewModel.iconAsset.collect { iconAsset ->
view.updateIconViewAnimation(iconAsset) if (view.isSfps) {
view.updateIconViewAnimation(iconAsset)
}
} }
} }
} }