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

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

Merge "Fix stuck when fullscreen launch" into udc-dev am: 7ed6f0ba 

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



Change-Id: Ic1969f6b1f0f100403e196719314c488fd4ab3f2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7748d9bb 7ed6f0ba

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

+4 −0
Original line number Diff line number Diff line
@@ -579,6 +579,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                mRecentTasks.get().removeSplitPair(taskId1);

            }

            options1 = options1 != null ? options1 : new Bundle();

            addActivityOptions(options1, null);

            wct.startTask(taskId1, options1);

            mSplitTransitions.startFullscreenTransition(wct, remoteTransition);

            return;
@@ -600,6 +601,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        final WindowContainerTransaction wct = new WindowContainerTransaction();

        if (taskId == INVALID_TASK_ID) {

            options1 = options1 != null ? options1 : new Bundle();

            addActivityOptions(options1, null);

            wct.sendPendingIntent(pendingIntent, fillInIntent, options1);

            mSplitTransitions.startFullscreenTransition(wct, remoteTransition);

            return;
@@ -620,6 +622,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        final WindowContainerTransaction wct = new WindowContainerTransaction();

        if (taskId == INVALID_TASK_ID) {

            options1 = options1 != null ? options1 : new Bundle();

            addActivityOptions(options1, null);

            wct.startShortcut(mContext.getPackageName(), shortcutInfo, options1);

            mSplitTransitions.startFullscreenTransition(wct, remoteTransition);

            return;
@@ -678,6 +681,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        final WindowContainerTransaction wct = new WindowContainerTransaction();

        if (pendingIntent2 == null) {

            options1 = options1 != null ? options1 : new Bundle();

            addActivityOptions(options1, null);

            if (shortcutInfo1 != null) {

                wct.startShortcut(mContext.getPackageName(), shortcutInfo1, options1);

            } else {