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

Commit 39db361a authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Transitions - Support OCCLUDED -> GONE" into tm-qpr-dev am: 3e2a4cb6... 

Merge "Transitions - Support OCCLUDED -> GONE" into tm-qpr-dev am: 3e2a4cb6 am: f6d6eb4a am: 67cba8f8

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



Change-Id: I06d3df0b635974c6b1813eafc4b233c03c1e751d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 71f8a81e 67cba8f8

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

+47 −3
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ constructor( 
        listenForOccludedToLockscreen()

        listenForOccludedToDreaming()

        listenForOccludedToAodOrDozing()

        listenForOccludedToGone()

    }



    private fun listenForOccludedToDreaming() {
@@ -72,11 +73,22 @@ constructor( 
    private fun listenForOccludedToLockscreen() {

        scope.launch {

            keyguardInteractor.isKeyguardOccluded

                .sample(keyguardTransitionInteractor.startedKeyguardTransitionStep, ::Pair)

                .collect { (isOccluded, lastStartedKeyguardState) ->

                .sample(

                    combine(

                        keyguardInteractor.isKeyguardShowing,

                        keyguardTransitionInteractor.startedKeyguardTransitionStep,

                        ::Pair

                    ),

                    ::toTriple

                )

                .collect { (isOccluded, isShowing, lastStartedKeyguardState) ->

                    // Occlusion signals come from the framework, and should interrupt any

                    // existing transition

                    if (!isOccluded && lastStartedKeyguardState.to == KeyguardState.OCCLUDED) {

                    if (

                        !isOccluded &&

                            isShowing &&

                            lastStartedKeyguardState.to == KeyguardState.OCCLUDED

                    ) {

                        keyguardTransitionRepository.startTransition(

                            TransitionInfo(

                                name,
@@ -90,6 +102,38 @@ constructor( 
        }

    }



    private fun listenForOccludedToGone() {

        scope.launch {

            keyguardInteractor.isKeyguardOccluded

                .sample(

                    combine(

                        keyguardInteractor.isKeyguardShowing,

                        keyguardTransitionInteractor.startedKeyguardTransitionStep,

                        ::Pair

                    ),

                    ::toTriple

                )

                .collect { (isOccluded, isShowing, lastStartedKeyguardState) ->

                    // Occlusion signals come from the framework, and should interrupt any

                    // existing transition

                    if (

                        !isOccluded &&

                            !isShowing &&

                            lastStartedKeyguardState.to == KeyguardState.OCCLUDED

                    ) {

                        keyguardTransitionRepository.startTransition(

                            TransitionInfo(

                                name,

                                KeyguardState.OCCLUDED,

                                KeyguardState.GONE,

                                getAnimator(),

                            )

                        )

                    }

                }

        }

    }



    private fun listenForOccludedToAodOrDozing() {

        scope.launch {

            keyguardInteractor.wakefulnessModel

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

+86 −0
Original line number Diff line number Diff line
@@ -967,6 +967,92 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { 
            coroutineContext.cancelChildren()

        }



    @Test

    fun `OCCLUDED to GONE`() =

        testScope.runTest {

            // GIVEN a device on lockscreen

            keyguardRepository.setKeyguardShowing(true)

            runCurrent()



            // GIVEN a prior transition has run to OCCLUDED

            runner.startTransition(

                testScope,

                TransitionInfo(

                    ownerName = "",

                    from = KeyguardState.LOCKSCREEN,

                    to = KeyguardState.OCCLUDED,

                    animator =

                        ValueAnimator().apply {

                            duration = 10

                            interpolator = Interpolators.LINEAR

                        },

                )

            )

            keyguardRepository.setKeyguardOccluded(true)

            runCurrent()

            reset(mockTransitionRepository)



            // WHEN keyguard goes away

            keyguardRepository.setKeyguardShowing(false)

            // AND occlusion ends

            keyguardRepository.setKeyguardOccluded(false)

            runCurrent()



            val info =

                withArgCaptor<TransitionInfo> {

                    verify(mockTransitionRepository).startTransition(capture(), anyBoolean())

                }

            // THEN a transition to GONE should occur

            assertThat(info.ownerName).isEqualTo("FromOccludedTransitionInteractor")

            assertThat(info.from).isEqualTo(KeyguardState.OCCLUDED)

            assertThat(info.to).isEqualTo(KeyguardState.GONE)

            assertThat(info.animator).isNotNull()



            coroutineContext.cancelChildren()

        }



    @Test

    fun `OCCLUDED to LOCKSCREEN`() =

        testScope.runTest {

            // GIVEN a device on lockscreen

            keyguardRepository.setKeyguardShowing(true)

            runCurrent()



            // GIVEN a prior transition has run to OCCLUDED

            runner.startTransition(

                testScope,

                TransitionInfo(

                    ownerName = "",

                    from = KeyguardState.LOCKSCREEN,

                    to = KeyguardState.OCCLUDED,

                    animator =

                        ValueAnimator().apply {

                            duration = 10

                            interpolator = Interpolators.LINEAR

                        },

                )

            )

            keyguardRepository.setKeyguardOccluded(true)

            runCurrent()

            reset(mockTransitionRepository)



            // WHEN occlusion ends

            keyguardRepository.setKeyguardOccluded(false)

            runCurrent()



            val info =

                withArgCaptor<TransitionInfo> {

                    verify(mockTransitionRepository).startTransition(capture(), anyBoolean())

                }

            // THEN a transition to LOCKSCREEN should occur

            assertThat(info.ownerName).isEqualTo("FromOccludedTransitionInteractor")

            assertThat(info.from).isEqualTo(KeyguardState.OCCLUDED)

            assertThat(info.to).isEqualTo(KeyguardState.LOCKSCREEN)

            assertThat(info.animator).isNotNull()



            coroutineContext.cancelChildren()

        }



    private fun startingToWake() =

        WakefulnessModel(

            WakefulnessState.STARTING_TO_WAKE,