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

Commit c01c5f88 authored by Automerger Merge Worker's avatar Automerger Merge Worker
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 am: b7d927c8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22504283



Change-Id: I6e8838f08bf5c4bd86d28eff1451a7f8c9724bb9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 305e0917 b7d927c8

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

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

        if (taskId2 == INVALID_TASK_ID) {

            // 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.update(ActivityOptions.makeRemoteAnimation(adapter));

            options1 = activityOptions.toBundle();