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

Commit b7d927c8 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix launch single task case if it under split roots" into... 

Merge "Merge "Fix launch single task case if it under split roots" into tm-qpr-dev am: 09c1e200" into tm-qpr-dev-plus-aosp
parents 438800a1 e9c00923

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -716,6 +716,10 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        if (options1 == null) options1 = new Bundle();

        if (options1 == null) options1 = new Bundle();

        if (taskId2 == INVALID_TASK_ID) {

        if (taskId2 == INVALID_TASK_ID) {

            // Launching a solo task.

            // Launching a solo task.

            // Exit split first if this task under split roots.

            if (mMainStage.containsTask(taskId1) || mSideStage.containsTask(taskId1)) {

                exitSplitScreen(null /* childrenToTop */, EXIT_REASON_RECREATE_SPLIT);

            }

            ActivityOptions activityOptions = ActivityOptions.fromBundle(options1);

            ActivityOptions activityOptions = ActivityOptions.fromBundle(options1);

            activityOptions.update(ActivityOptions.makeRemoteAnimation(adapter));

            activityOptions.update(ActivityOptions.makeRemoteAnimation(adapter));

            options1 = activityOptions.toBundle();

            options1 = activityOptions.toBundle();