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

Commit 5a70541b authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Transitions - Support OCCLUDED -> GONE"" into tm-qpr-dev am: f5c58b67 am: 568902c5 am: 08cd63f7 am: 6cf5ccc0

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



Change-Id: I5aa6f1b1f31c177c36a976f97ad4b78c00a4adf5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5c464f21 6cf5ccc0

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

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


    override fun start() {

        listenForOccludedToLockscreen()

        listenForOccludedToGone()

        listenForOccludedToDreaming()

        listenForOccludedToAodOrDozing()

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

        scope.launch {

            keyguardInteractor.isKeyguardOccluded

                .sample(

                    combine(

                        keyguardInteractor.isKeyguardShowing,

                        keyguardTransitionInteractor.startedKeyguardTransitionStep,

                        ::Pair

                    ),

                    ::toTriple

                )

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

                .sample(keyguardTransitionInteractor.startedKeyguardTransitionStep, ::Pair)

                .collect { (isOccluded, lastStartedKeyguardState) ->

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

                    // existing transition

                    if (

                        !isOccluded &&

                            isShowing &&

                            lastStartedKeyguardState.to == KeyguardState.OCCLUDED

                    ) {

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

                        keyguardTransitionRepository.startTransition(

                            TransitionInfo(

                                name,
@@ -102,38 +90,6 @@ 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

+0 −86
Original line number Diff line number Diff line
@@ -357,92 +357,6 @@ 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()

        }



    @Test

    fun `LOCKSCREEN to DOZING`() =

        testScope.runTest {