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

Commit 5e9526b3 authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Consolidate adjacent launch while having a background split pair" into... 

Merge "Consolidate adjacent launch while having a background split pair" into udc-dev am: 71884552 am: d865e91f

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



Change-Id: I7de5e7848d8d5c649788437eab52ed33a63906a6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2de72199 d865e91f

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

+8 −2
Original line number Diff line number Diff line
@@ -1496,6 +1496,10 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        }

        // If running background, we need to reparent current top visible task to main stage.

        if (!isSplitScreenVisible()) {

            // Ensure to evict old splitting tasks because the new split pair might be composed by

            // one of the splitting tasks, evicting the task when finishing entering transition

            // won't guarantee to put the task to the indicated new position.

            mMainStage.evictAllChildren(wct);

            mMainStage.reparentTopTask(wct);

            prepareSplitLayout(wct);

        }
@@ -2323,8 +2327,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                    mSplitTransitions.setDismissTransition(transition, dismissTop,

                            EXIT_REASON_APP_FINISHED);

                } else if (!isSplitScreenVisible() && isOpening) {

                    // If split running backgroud and trigger task is appearing into split,

                    // prepare to enter split screen.

                    // If split is running in the background and the trigger task is appearing into

                    // split, prepare to enter split screen.

                    setSideStagePosition(SPLIT_POSITION_BOTTOM_OR_RIGHT, out);

                    prepareEnterSplitScreen(out);

                    mSplitTransitions.setEnterTransition(transition, request.getRemoteTransition(),

                            TRANSIT_SPLIT_SCREEN_PAIR_OPEN, !mIsDropEntering);
@@ -2350,6 +2355,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            if (isOpening && getStageOfTask(triggerTask) != null) {

                // One task is appearing into split, prepare to enter split screen.

                out = new WindowContainerTransaction();

                setSideStagePosition(SPLIT_POSITION_BOTTOM_OR_RIGHT, out);

                prepareEnterSplitScreen(out);

                mSplitTransitions.setEnterTransition(transition, request.getRemoteTransition(),

                        TRANSIT_SPLIT_SCREEN_PAIR_OPEN, !mIsDropEntering);