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

Commit cbff6701 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not set side stage position" into udc-dev am: a85de1fb 

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



Change-Id: I76025204435a1d4614dad455d8e4cc25c5694858
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cad39696 a85de1fb

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -2324,7 +2324,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                } else if (!isSplitScreenVisible() && isOpening) {

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

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

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

                    // split, prepare to enter split screen.

                    // split, prepare to enter split screen.

                    setSideStagePosition(SPLIT_POSITION_BOTTOM_OR_RIGHT, out);

                    prepareEnterSplitScreen(out);

                    prepareEnterSplitScreen(out);

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

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

                            TRANSIT_SPLIT_SCREEN_PAIR_OPEN, !mIsDropEntering);

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

            if (isOpening && getStageOfTask(triggerTask) != null) {

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

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

                out = new WindowContainerTransaction();

                out = new WindowContainerTransaction();

                setSideStagePosition(SPLIT_POSITION_BOTTOM_OR_RIGHT, out);

                prepareEnterSplitScreen(out);

                prepareEnterSplitScreen(out);

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

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

                        TRANSIT_SPLIT_SCREEN_PAIR_OPEN, !mIsDropEntering);

                        TRANSIT_SPLIT_SCREEN_PAIR_OPEN, !mIsDropEntering);