[flexiglass] Don't change to bouncer scene when panel expansion changes.

In Flexiglass, we don't need to model the appearance of another scene
based on the expansion of a scene; this is what the scene graph is for.

The code here was causing a switch to the bouncer scene when swiping up
on the lockscreen scene while the device was actually unlocked (a state
one can get to by unlocking and unfolded foldable device and then
folding it shut again).

Also made sure that the bugs fixed by ag/20621509 (which added the
legacy version of this code) aren't present in Flexiglass.

Bug: 341445974
Test: manually, see above
Flag: com.android.systemui.scene_container
Change-Id: I07060180ec8bfc2e260e628c787c4d1a06c2a47b

1 files changed, 2 insertions, 7 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
index d9f88c494649..5bbc3bd92543 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@ -655,13 +655,8 @@ 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 {
-                mPrimaryBouncerInteractor.show(/* isScrimmed= */false);
-            }
+        if (!SceneContainerFlag.isEnabled() && beginShowingBouncer(event)) {
+            mPrimaryBouncerInteractor.show(/* isScrimmed= */false);
         }
 
         if (!primaryBouncerIsOrWillBeShowing()) {