diff options
2 files changed, 11 insertions, 11 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/PromptSelectorInteractor.kt b/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/PromptSelectorInteractor.kt index c08756f6ae36..5e2b5ff5c1ac 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/PromptSelectorInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/PromptSelectorInteractor.kt @@ -74,7 +74,7 @@ interface PromptSelectorInteractor { val isConfirmationRequired: Flow<Boolean> /** Fingerprint sensor type */ - val sensorType: Flow<FingerprintSensorType> + val fingerprintSensorType: Flow<FingerprintSensorType> /** Switch to the credential view. */ fun onSwitchToCredential() @@ -154,7 +154,8 @@ constructor( } } - override val sensorType: Flow<FingerprintSensorType> = fingerprintPropertyRepository.sensorType + override val fingerprintSensorType: Flow<FingerprintSensorType> = + fingerprintPropertyRepository.sensorType override fun onSwitchToCredential() { val modalities: BiometricModalities = diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptIconViewModel.kt b/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptIconViewModel.kt index 7081661708de..6c6ef5ac175e 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptIconViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptIconViewModel.kt @@ -21,7 +21,6 @@ import android.annotation.DrawableRes import android.annotation.RawRes import android.content.res.Configuration import android.graphics.Rect -import android.hardware.face.Face import android.util.RotationUtils import com.android.systemui.biometrics.domain.interactor.DisplayStateInteractor import com.android.systemui.biometrics.domain.interactor.PromptSelectorInteractor @@ -137,7 +136,7 @@ constructor( displayStateInteractor.currentRotation, displayStateInteractor.isFolded, displayStateInteractor.isInRearDisplayMode, - promptSelectorInteractor.sensorType, + promptSelectorInteractor.fingerprintSensorType, promptViewModel.isAuthenticated, promptViewModel.isAuthenticating, promptViewModel.showingError @@ -183,7 +182,7 @@ constructor( displayStateInteractor.currentRotation, displayStateInteractor.isFolded, displayStateInteractor.isInRearDisplayMode, - promptSelectorInteractor.sensorType, + promptSelectorInteractor.fingerprintSensorType, promptViewModel.isAuthenticated, promptViewModel.isAuthenticating, promptViewModel.isPendingConfirmation, @@ -330,7 +329,7 @@ constructor( AuthType.Coex -> combine( displayStateInteractor.currentRotation, - promptSelectorInteractor.sensorType, + promptSelectorInteractor.fingerprintSensorType, promptViewModel.isAuthenticated, promptViewModel.isAuthenticating, promptViewModel.showingError @@ -430,7 +429,7 @@ constructor( AuthType.Fingerprint, AuthType.Coex -> combine( - promptSelectorInteractor.sensorType, + promptSelectorInteractor.fingerprintSensorType, promptViewModel.isAuthenticated, promptViewModel.isAuthenticating, promptViewModel.isPendingConfirmation, @@ -508,7 +507,7 @@ constructor( when (activeAuthType) { AuthType.Fingerprint -> combine( - promptSelectorInteractor.sensorType, + promptSelectorInteractor.fingerprintSensorType, promptViewModel.isAuthenticated, promptViewModel.isAuthenticating, promptViewModel.showingError @@ -546,7 +545,7 @@ constructor( } AuthType.Coex -> combine( - promptSelectorInteractor.sensorType, + promptSelectorInteractor.fingerprintSensorType, promptViewModel.isAuthenticated, promptViewModel.isAuthenticating, promptViewModel.isPendingConfirmation, @@ -606,7 +605,7 @@ constructor( AuthType.Fingerprint, AuthType.Coex -> combine( - promptSelectorInteractor.sensorType, + promptSelectorInteractor.fingerprintSensorType, promptViewModel.isAuthenticated, promptViewModel.isAuthenticating, promptViewModel.showingError @@ -642,7 +641,7 @@ constructor( AuthType.Fingerprint, AuthType.Coex -> combine( - promptSelectorInteractor.sensorType, + promptSelectorInteractor.fingerprintSensorType, displayStateInteractor.currentRotation ) { sensorType: FingerprintSensorType, rotation: DisplayRotation -> when (sensorType) { |