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

Commit 851008d6 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 am: 1e422b93 

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



Change-Id: I0d4f4139fa7c18fb771a1a5fe8249f4c45c7e6e1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b3493fd6 1e422b93

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

+0 −2
Original line number Diff line number Diff line
@@ -2336,7 +2336,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);
@@ -2362,7 +2361,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);