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

Commit c3aea7ad authored by Ale Nijamkin's avatar Ale Nijamkin
Browse files

[flexiglass] Instantly switch to Gone when unlocking from Bouncer 

This fixes the bug where the lockscreen scene would show behind the
bouncer as the bouncer overlay was being hidden due to an unlock.

Fix: 432552235
Test: manually verified that the lockscreen isn't visible as the bouncer
overlay is animating away after a successful unlock. To make sure the
bug was more visible, I dismisses all notifications on the lockscreen
before testing as the large clock makes the bug more obvious.
Flag: com.android.systemui.scene_container

Change-Id: Ic8b9e7beaf4b7a47d8b0f89b4c39f5d7e271302e
parent 4ac4d704

packages/SystemUI/src/com/android/systemui/scene/domain/interactor/SceneInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ constructor( 


        repository.instantlyTransitionTo(

            scene = resolvedScene,

            overlays = if (hideAllOverlays) emptySet() else currentOverlays.value,

            overlays = emptySet<OverlayKey>().takeIf { hideAllOverlays },

        )

    }

packages/SystemUI/src/com/android/systemui/scene/domain/startable/SceneContainerStartable.kt

+22 −9
Original line number Diff line number Diff line
@@ -539,6 +539,7 @@ constructor( 
                                            HideOverlayCommand.HideAll

                                        },

                                    loggingReason = loggingReason,

                                    instantlySnapScenes = true,

                                )

                            } else {

                                if (previousScene.value != Scenes.Gone) {
@@ -549,6 +550,7 @@ constructor( 
                                    loggingReason =

                                        "device was unlocked with primary bouncer" +

                                            " showing, from sceneKey=${targetScene.debugName}",

                                    instantlySnapScenes = true,

                                )

                            }

                        }
@@ -590,6 +592,7 @@ constructor( 
                                targetSceneKey = command.targetSceneKey,

                                hideOverlays = command.hideOverlays,

                                loggingReason = command.loggingReason,

                                instantlySnapScenes = command.instantlySnapScenes,

                            )

                        }

                        is SwitchSceneCommand.NoOp -> Unit
@@ -1048,6 +1051,7 @@ constructor( 
        sceneState: Any? = null,

        freezeAndAnimateToCurrentState: Boolean = false,

        hideOverlays: HideOverlayCommand = HideOverlayCommand.HideAll,

        instantlySnapScenes: Boolean = false,

    ) {

        if (hideOverlays is HideOverlayCommand.HideSome) {

            hideOverlays.overlays.fastForEach { overlay ->
@@ -1055,6 +1059,13 @@ constructor( 
            }

        }



        if (instantlySnapScenes) {

            sceneInteractor.snapToScene(

                toScene = targetSceneKey,

                loggingReason = loggingReason,

                hideAllOverlays = hideOverlays == HideOverlayCommand.HideAll,

            )

        } else {

            sceneInteractor.changeScene(

                toScene = targetSceneKey,

                loggingReason = loggingReason,
@@ -1063,6 +1074,7 @@ constructor( 
                hideAllOverlays = hideOverlays == HideOverlayCommand.HideAll,

            )

        }

    }



    private fun hydrateBackStack() {

        applicationScope.launch {
@@ -1160,6 +1172,7 @@ constructor( 
            val targetSceneKey: SceneKey,

            val loggingReason: String,

            val hideOverlays: HideOverlayCommand = HideOverlayCommand.HideAll,

            val instantlySnapScenes: Boolean = false,

        ) : SwitchSceneCommand

    }