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

Commit 27eb15f1 authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Merge "Switch expandAndSelectBubble to be gated by create flag" into main

parents 3adcc7b7 0878ad2a

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

+2 −2
Original line number Diff line number Diff line
@@ -1659,7 +1659,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;
@@ -1692,7 +1692,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