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

Commit 27df631c authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Merge changes Ifd7bc217,I337d0189 into tm-qpr-dev 

* changes:
  Allow UserSwitcherActivity in LockDownTask mode
  Transitions - Legacy dream -> lockscreen flicker
parents 5b505035 05053527

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -900,7 +900,7 @@ 
                  android:showWhenLocked="true"

                  android:showForAllUsers="true"

                  android:finishOnTaskLaunch="true"

                  android:launchMode="singleInstance"

                  android:lockTaskMode="if_whitelisted"

                  android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden"

                  android:visibleToInstantApps="true">

        </activity>

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

+9 −3
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import kotlinx.coroutines.CoroutineScope 
import kotlinx.coroutines.delay

import kotlinx.coroutines.flow.collect

import kotlinx.coroutines.flow.combine

import kotlinx.coroutines.flow.distinctUntilChanged

import kotlinx.coroutines.flow.onEach

import kotlinx.coroutines.launch
@@ -56,9 +57,14 @@ constructor( 


    private fun listenForDreamingToLockscreen() {

        scope.launch {

            // Using isDreamingWithOverlay provides an optimized path to LOCKSCREEN state, which

            // otherwise would have gone through OCCLUDED first

            keyguardInteractor.isAbleToDream

            // Dependending on the dream, either dream state or occluded change will change first,

            // so listen for both

            combine(keyguardInteractor.isAbleToDream, keyguardInteractor.isKeyguardOccluded) {

                    isAbleToDream,

                    isKeyguardOccluded ->

                    isAbleToDream && isKeyguardOccluded

                }

                .distinctUntilChanged()

                .sample(

                    combine(

                        keyguardInteractor.dozeTransitionModel,

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

+51 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { 
    }



    @Test

    fun `DREAMING to LOCKSCREEN`() =

    fun `DREAMING to LOCKSCREEN - dreaming state changes first`() =

        testScope.runTest {

            // GIVEN a device is dreaming and occluded

            keyguardRepository.setDreamingWithOverlay(true)
@@ -188,9 +188,59 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { 
            )

            // AND dreaming has stopped

            keyguardRepository.setDreamingWithOverlay(false)

            advanceUntilIdle()

            // AND then occluded has stopped

            keyguardRepository.setKeyguardOccluded(false)

            advanceUntilIdle()



            val info =

                withArgCaptor<TransitionInfo> {

                    verify(mockTransitionRepository).startTransition(capture())

                }

            // THEN a transition to BOUNCER should occur

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

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

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

            assertThat(info.animator).isNotNull()



            coroutineContext.cancelChildren()

        }



    @Test

    fun `DREAMING to LOCKSCREEN - occluded state changes first`() =

        testScope.runTest {

            // GIVEN a device is dreaming and occluded

            keyguardRepository.setDreamingWithOverlay(true)

            keyguardRepository.setKeyguardOccluded(true)

            runCurrent()



            // GIVEN a prior transition has run to DREAMING

            runner.startTransition(

                testScope,

                TransitionInfo(

                    ownerName = "",

                    from = KeyguardState.LOCKSCREEN,

                    to = KeyguardState.DREAMING,

                    animator =

                        ValueAnimator().apply {

                            duration = 10

                            interpolator = Interpolators.LINEAR

                        },

                )

            )

            runCurrent()

            reset(mockTransitionRepository)



            // WHEN doze is complete

            keyguardRepository.setDozeTransitionModel(

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

            )

            // AND occluded has stopped

            keyguardRepository.setKeyguardOccluded(false)

            advanceUntilIdle()

            // AND then dreaming has stopped

            keyguardRepository.setDreamingWithOverlay(false)

            advanceUntilIdle()



            val info =

                withArgCaptor<TransitionInfo> {