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

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

Change-Id: Ie347dcf1c5ceb0be120ed8ab673d05a73b6d17ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tony Huang
2023-06-16 07:29:20 +00:00
committed by Automerger Merge Worker

View File

@@ -2511,8 +2511,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: