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

Commit 0184cec3 authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Only bring side to top when split visible" into udc-dev am: 01158d6e... 

Merge "Only bring side to top when split visible" into udc-dev am: 01158d6e am: 5e4cc90b am: 6d98fd18

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



Change-Id: I2a08b9fa7311ef624134753ab7620c49250a7c2c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 753f4e9e 6d98fd18

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

+3 −2
Original line number Diff line number Diff line
@@ -2523,8 +2523,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                        && getStageType(dismissStages.valueAt(0)) == STAGE_TYPE_MAIN)

                        || mMainStage.getChildCount() == 0 ? STAGE_TYPE_SIDE : STAGE_TYPE_MAIN;

                // If there is a fullscreen opening change, we should not bring stage to top.

                prepareExitSplitScreen(record.mContainShowFullscreenChange

                        ? STAGE_TYPE_UNDEFINED : dismissTop, wct);

                prepareExitSplitScreen(

                        !record.mContainShowFullscreenChange && isSplitScreenVisible()

                        ? dismissTop : STAGE_TYPE_UNDEFINED, wct);

                mSplitTransitions.startDismissTransition(wct, this, dismissTop,

                        EXIT_REASON_APP_FINISHED);

                // This can happen in some pathological cases. For example: