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

Commit a4ec5882 authored by Ats Jenk's avatar Ats Jenk
Browse files

Clean up bubbles expanded state in sysui state 

When the last bubble is removed and we are processing the update, make
sure we update sysui state that bubbles are no longer expanded.
BubbleStackView and BubbleBarLayerView should be updating the state.
But in case of bugs like b/391909607 where the state gets corrupted, we
don't want to leave the device in a state where the home gesture stops
working.
If we leave the sysui state as bubbles expanded, the home gesture is
ignored.

Bug: 391909607
Flag: com.android.wm.shell.enable_bubble_swipe_up_cleanup
Test: manual, exact repro steps in the linked bug
Change-Id: Ic7334afb1d5e5460bac3a906a8590d28bb5502d4
parent bd599322

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+10 −0
Original line number Diff line number Diff line
@@ -2506,6 +2506,16 @@ public class BubbleController implements ConfigurationChangeListener, 
                mSysuiProxy.requestNotificationShadeTopUi(true, TAG);

            }



            if (Flags.enableBubbleSwipeUpCleanup() && !update.removedBubbles.isEmpty()

                    && !mBubbleData.hasBubbles()) {

                // This update removed all the bubbles. Send an update to SystemUI to mark the stack

                // collapsed. This should be sent by the UI classes (BubbleStackView or

                // BubbleBarLayerView), but if we fail to send this, home gesture stops working.

                // To avoid leaving the device in a bad state, add a failsafe call here to clean

                // up the state.

                mSysuiProxy.onStackExpandChanged(false);

            }



            mSysuiProxy.notifyInvalidateNotifications("BubbleData.Listener.applyUpdate");

            updateBubbleViews();