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

Commit 3f16887e authored by Ats Jenk's avatar Ats Jenk
Browse files

Collapse bubbles if removing bubble via transition 

Bubble is removed via transition if it is being converted to fullscreen.
In this case we don't want the bubbles to remain open or another bubble
getting selected.
Check for this case and collapse bubbles.

Bug: 401033122
Test: have 2 apps in bubble bar, move one app to fullscreen via menu or
  drag, check it remains open and bubbles are collapsed
Flag: com.android.wm.shell.enable_bubble_to_fullscreen
Change-Id: I8277605abfc21a41171413f924f01373dcb2d531
parent 4d2a2953

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

+3 −3
Original line number Diff line number Diff line
@@ -447,9 +447,9 @@ public class BubbleBarLayerView extends FrameLayout 
            bubble.cleanupViews(!inTransition);

            endAction.run();

        };

        if (mBubbleData.getBubbles().isEmpty()) {

            // we're removing the last bubble. collapse the expanded view and cleanup bubble views

            // at the end.

        if (mBubbleData.getBubbles().isEmpty() || inTransition) {

            // If we are removing the last bubble or removing the current bubble via transition,

            // collapse the expanded view and clean up bubbles at the end.

            collapse(cleanUp);

        } else {

            cleanUp.run();