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

Commit 0878ad2a authored by Mady Mellor's avatar Mady Mellor
Browse files

Switch expandAndSelectBubble to be gated by create flag 

These are needed for behavior around launching a new task
from a bubble. The UI entry points to transform something fullscreen
are gated by the fullscreen flag so it should be fine to use the
create flag here.

Flag: com.android.wm.shell.enable_create_any_bubble
Test: manual - create gmail bubble, tap compose, observe it opens
               as a separate bubble
Bug: 415724598
Change-Id: I034a27f706dfe3a9933448686ea62f34d29b9c55
parent 49eebfe3

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

+2 −2
Original line number Diff line number Diff line
@@ -1658,7 +1658,7 @@ public class BubbleController implements ConfigurationChangeListener, 
     */

    public void expandStackAndSelectBubble(ActivityManager.RunningTaskInfo taskInfo,

            @Nullable BubbleTransitions.DragData dragData) {

        if (!BubbleAnythingFlagHelper.enableBubbleToFullscreen()) return;

        if (!BubbleAnythingFlagHelper.enableCreateAnyBubble()) return;

        Bubble b = mBubbleData.getOrCreateBubble(taskInfo); // Removes from overflow

        ProtoLog.v(WM_SHELL_BUBBLES, "expandStackAndSelectBubble - taskId=%s", taskInfo.taskId);

        BubbleBarLocation location = null;
@@ -1691,7 +1691,7 @@ public class BubbleController implements ConfigurationChangeListener, 
            @NonNull ActivityManager.RunningTaskInfo taskInfo,

            @NonNull IBinder transition,

            Consumer<Transitions.TransitionHandler> onInflatedCallback) {

        if (!BubbleAnythingFlagHelper.enableBubbleToFullscreen()) return null;

        if (!BubbleAnythingFlagHelper.enableCreateAnyBubble()) return null;



        // Create a new bubble and show it

        Bubble b = mBubbleData.getOrCreateBubble(taskInfo); // Removes from overflow