Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f4ed274 authored by Grace Cheng's avatar Grace Cheng Committed by Automerger Merge Worker
Browse files

Merge "Fix regression from ag/22534576" into udc-dev am: 1b25aefa am: 31007994 am: aa6cd9f7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23004252



Change-Id: Idbe28229a8d72960b394e62ff57654c4b8f76985
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 374c9403 aa6cd9f7

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

    }

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

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

        }

    }

}