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

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

Merge "Fix clock fading in incorrectly" into tm-qpr-dev am: c72ea6b3 am:... 

Merge "Fix clock fading in incorrectly" into tm-qpr-dev am: c72ea6b3 am: 0a0337a4 am: c2966f2f

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



Change-Id: I4da39b4bb267eb44330f6f63e1b35cbd41beba55
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 894946cb c2966f2f

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

+5 −1
Original line number Diff line number Diff line
@@ -64,7 +64,11 @@ constructor( 
                .sample(keyguardTransitionInteractor.startedKeyguardTransitionStep, ::Pair)

                .collect { pair ->

                    val (isAbleToDream, lastStartedTransition) = pair

                    if (isAbleToDream && lastStartedTransition.to == KeyguardState.LOCKSCREEN) {

                    if (

                        isAbleToDream &&

                            lastStartedTransition.to == KeyguardState.LOCKSCREEN &&

                            lastStartedTransition.from != KeyguardState.AOD

                    ) {

                        keyguardTransitionRepository.startTransition(

                            TransitionInfo(

                                name,

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

+44 −0
Original line number Diff line number Diff line
@@ -357,6 +357,50 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { 
            coroutineContext.cancelChildren()

        }



    @Test

    fun `LOCKSCREEN to DREAMING`() =

        testScope.runTest {

            // GIVEN a device that is not dreaming or dozing

            keyguardRepository.setDreamingWithOverlay(false)

            keyguardRepository.setWakefulnessModel(startingToWake())

            keyguardRepository.setDozeTransitionModel(

                DozeTransitionModel(from = DozeStateModel.DOZE, to = DozeStateModel.FINISH)

            )

            runCurrent()



            // GIVEN a prior transition has run to LOCKSCREEN

            runner.startTransition(

                testScope,

                TransitionInfo(

                    ownerName = "",

                    from = KeyguardState.GONE,

                    to = KeyguardState.LOCKSCREEN,

                    animator =

                        ValueAnimator().apply {

                            duration = 10

                            interpolator = Interpolators.LINEAR

                        },

                )

            )

            reset(mockTransitionRepository)



            // WHEN the device begins to dream

            keyguardRepository.setDreamingWithOverlay(true)

            advanceUntilIdle()



            val info =

                withArgCaptor<TransitionInfo> {

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

                }

            // THEN a transition to DREAMING should occur

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

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

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

            assertThat(info.animator).isNotNull()



            coroutineContext.cancelChildren()

        }



    @Test

    fun `LOCKSCREEN to DOZING`() =

        testScope.runTest {