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

Commit 8dcb5805 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 am: 14b81592 

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



Change-Id: I8076b22dbce465f68b95cf321df05f98dd339e22
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4db71347 14b81592

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: