From d6377803f04f77b15bf27ff007a0292697c0e555 Mon Sep 17 00:00:00 2001 From: Jeff Chang Date: Tue, 13 Jun 2023 04:57:04 +0000 Subject: [PATCH] Do not set side stage position c67d535eecfc170, 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 --- .../src/com/android/wm/shell/splitscreen/StageCoordinator.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java index 9d278b721becd..233a3d5c0536c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java @@ -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);