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

Commit d6377803 authored by Jeff Chang's avatar Jeff Chang
Browse files

Do not set side stage position 

c67d535e, Consolidate adjacent launch to update the stage
position, but it conflicts with startShort case. This CL doesn't
set the side stage during the handleRequest to prevent setting
the wrong stage position.

Bug: 286540547
Test: atest WMShellFlickerTests:EnterSplitScreenByDragFromShortcut
Change-Id: I02a87a404b9ecc6a3ceac31531d670f55d4cc9d4
parent 6e64c179

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

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

                    // 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);
@@ -2346,7 +2345,6 @@ 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);