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

Commit 3c4b1a2e authored by Josh Tsuji's avatar Josh Tsuji Committed by Android (Google) Code Review
Browse files

Merge "Keep LS not visible during screen off." into main

parents 4af9579d 16c8c849

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

+3 −1
Original line number Diff line number Diff line
@@ -1107,7 +1107,9 @@ class WindowManagerLockscreenVisibilityInteractorTest : SysuiTestCase() { 
            assertThat(lockscreenVisibility).isFalse()



            setSceneTransition(Transition(from = Scenes.Gone, to = Scenes.Lockscreen))

            assertThat(lockscreenVisibility).isTrue()

            // Lockscreen remains not visible during the transition so that the unlocked app content

            // is visible under the light reveal screen off animation.

            assertThat(lockscreenVisibility).isFalse()



            setSceneTransition(Idle(Scenes.Lockscreen))

            sceneInteractor.changeScene(Scenes.Lockscreen, "")

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

+2 −4
Original line number Diff line number Diff line
@@ -224,11 +224,9 @@ constructor( 


                                is Transition.ChangeScene ->

                                    when {

                                        // If transitioning between two scenes and any one of the

                                        // two scenes is one of the keyguard scenes, report that the

                                        // keyguard is visible.

                                        // If transitioning between keyguard and another scene, keep

                                        // lockscreen visible until the transition ends.

                                        it.fromScene in keyguardScenes -> flowOf(true)

                                        it.toScene in keyguardScenes -> flowOf(true)

                                        // If transitioning between two non-keyguard scenes but the

                                        // bouncer overlay is showing, report that the keyguard is

                                        // visible.