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

Commit db8d9a63 authored by Coco Duan's avatar Coco Duan Committed by Android (Google) Code Review
Browse files

Merge "Use isDreaming signal for Gone->Dream transition" into main

parents 6eaccc02 2d8da3d0

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

+0 −3
Original line number Diff line number Diff line
@@ -567,9 +567,6 @@ class KeyguardTransitionScenariosTest(flags: FlagsParameterization?) : SysuiTest 
    @DisableSceneContainer

    fun goneToDreaming() =

        testScope.runTest {

            // Setup - Move past initial delay with [KeyguardInteractor#isAbleToDream]

            advanceTimeBy(600L)



            // GIVEN a prior transition has run to GONE

            runTransitionAndSetWakefulness(KeyguardState.LOCKSCREEN, KeyguardState.GONE)

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

+2 −2
Original line number Diff line number Diff line
@@ -136,8 +136,8 @@ constructor( 


    private fun listenForGoneToDreaming() {

        scope.launch("$TAG#listenForGoneToDreaming") {

            keyguardInteractor.isAbleToDream

                .filterRelevantKeyguardStateAnd { isAbleToDream -> isAbleToDream }

            keyguardInteractor.isDreaming

                .filterRelevantKeyguardStateAnd { isDreaming -> isDreaming }

                .collect { startTransitionTo(KeyguardState.DREAMING) }

        }

    }