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

Commit 4a92f19e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up fix_bubbles_to_recents flag in shell" into main

parents ca1a32cf f4aed9d9

libs/WindowManager/Shell/aconfig/multitasking.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -223,16 +223,6 @@ flag { 
    }

}



flag {

    name: "fix_bubbles_to_recents"

    namespace: "multitasking"

    description: "Fixes a bug with entering recents via 3 button when bubbles are open"

    bug: "418760100"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "bug_rotation_button_cover_bubble"

    namespace: "multitasking"

libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java

+1 −2
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ import androidx.annotation.NonNull; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.os.IResultReceiver;

import com.android.internal.protolog.ProtoLog;

import com.android.wm.shell.Flags;

import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.bubbles.BubbleController;

import com.android.wm.shell.common.DisplayController;
@@ -1128,7 +1127,7 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler, 
            for (int i = 0; i < info.getChanges().size(); ++i) {

                final TransitionInfo.Change change = info.getChanges().get(i);

                final ActivityManager.RunningTaskInfo taskInfo = change.getTaskInfo();

                if (Flags.fixBubblesToRecents() && taskInfo != null && mBubbleController.isPresent()

                if (taskInfo != null && mBubbleController.isPresent()

                        && mBubbleController.get().hasStableBubbleForTask(taskInfo.taskId)) {

                    ProtoLog.v(ShellProtoLogGroup.WM_SHELL_RECENTS_TRANSITION,

                            "[%d]   Canceling due to bubble task", mInstanceId);

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/RecentsTransitionHandlerTest.java

+0 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import static com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_RECENTS_TRANSIT 
import static com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_SPLITSCREEN_TRANSITION_BUGFIX;

import static com.android.window.flags.Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND;

import static com.android.wm.shell.Flags.FLAG_ENABLE_PIP2;

import static com.android.wm.shell.Flags.FLAG_FIX_BUBBLES_TO_RECENTS;

import static com.android.wm.shell.recents.RecentsTransitionStateListener.TRANSITION_STATE_ANIMATING;

import static com.android.wm.shell.recents.RecentsTransitionStateListener.TRANSITION_STATE_NOT_RUNNING;

import static com.android.wm.shell.recents.RecentsTransitionStateListener.TRANSITION_STATE_REQUESTED;
@@ -587,7 +586,6 @@ public class RecentsTransitionHandlerTest extends ShellTestCase { 
    }



    @Test

    @EnableFlags(FLAG_FIX_BUBBLES_TO_RECENTS)

    public void testMerge_cancelBubbleToBack() throws Exception {

        TransitionInfo mergeTransitionInfo = new TransitionInfoBuilder(TRANSIT_TO_BACK)

                .addChange(TRANSIT_TO_BACK, new TestRunningTaskInfoBuilder().setTaskId(123).build())