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

Commit 308c3d6f authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Android (Google) Code Review
Browse files

Merge "[flexiglass] Don't change to bouncer scene when panel expansion changes." into main

parents 90097016 1ca726cd
Loading
Loading
Loading
Loading
+2 −7
Original line number Diff line number Diff line
@@ -655,14 +655,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
         * device state and touch handling. The bouncer MUST have been notified that it is about to
         * show if any subsequent events are to be handled.
         */
        if (beginShowingBouncer(event)) {
            if (SceneContainerFlag.isEnabled()) {
                mSceneInteractorLazy.get().changeScene(
                        Scenes.Bouncer, "StatusBarKeyguardViewManager.onPanelExpansionChanged");
            } else {
        if (!SceneContainerFlag.isEnabled() && beginShowingBouncer(event)) {
            mPrimaryBouncerInteractor.show(/* isScrimmed= */false);
        }
        }

        if (!primaryBouncerIsOrWillBeShowing()) {
            return;