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

Commit 16c8c849 authored by Josh Tsuji's avatar Josh Tsuji
Browse files

Keep LS not visible during screen off. 

This keeps the unlocked app content visible during the light reveal screen off animation. Once we're Idle on a keyguard scene (or start a transition from a keyguard scene, in the cancellation case), the lockscreen will be made visible, hiding the unlocked content.

Fixes: 428253107
Test: atest WindowManagerLockscreenVisibilityInteractorTest
Flag: com.android.systemui.scene_container
Change-Id: I7f3fcc25105d526d4df1b48103ccd2dcd05e991d
parent 10ee3973

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.