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

Commit 7c7f8bd3 authored by Josh Tsuji's avatar Josh Tsuji
Browse files

Revert "Revert "Check both isDozing and isAodAvailable for aodVi..." 

Revert submission 27773289-revert-27770576-DGMSFQBZGQ

Reason for revert: Test failure was unrelated

Reverted changes: /q/submissionid:27773289-revert-27770576-DGMSFQBZGQ

Change-Id: I1d6631945d3f604a6d7f304cb1ff4e1cec6a49d9
parent 9b0ed5c4

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/WindowManagerLockscreenVisibilityInteractor.kt

+5 −2
Original line number Diff line number Diff line
@@ -229,11 +229,14 @@ constructor( 
    val aodVisibility: Flow<Boolean> =

        combine(

                keyguardInteractor.isDozing,

                keyguardInteractor.isAodAvailable,

                keyguardInteractor.biometricUnlockState,

            ) { isDozing, biometricUnlockState ->

            ) { isDozing, isAodAvailable, biometricUnlockState ->

                // AOD is visible if we're dozing, unless we are wake and unlocking (where we go

                // directly from AOD to unlocked while dozing).

                isDozing && !BiometricUnlockMode.isWakeAndUnlock(biometricUnlockState.mode)

                isDozing &&

                    isAodAvailable &&

                    !BiometricUnlockMode.isWakeAndUnlock(biometricUnlockState.mode)

            }

            .distinctUntilChanged()