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

Commit e9c00923 authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Fix launch single task case if it under split roots" into tm-qpr-dev am: 09c1e200 

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



Change-Id: I83647af22cf477a77e8a0eab1285c10b8161c1d9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4a372e83 09c1e200

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

+4 −0
Original line number Diff line number Diff line
@@ -716,6 +716,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();