Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only bring side to top when split visible" into udc-dev

Browse Source
This commit is contained in:
Tony Huang
2023-06-16 06:54:09 +00:00
committed by Android (Google) Code Review
parent cd5243dc60 67ee747949
commit 01158d6e17
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2511,8 +2511,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
&& getStageType(dismissStages.valueAt(0)) == STAGE_TYPE_MAIN) && getStageType(dismissStages.valueAt(0)) == STAGE_TYPE_MAIN)
|| mMainStage.getChildCount() == 0 ? STAGE_TYPE_SIDE : 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. // If there is a fullscreen opening change, we should not bring stage to top.
prepareExitSplitScreen(record.mContainShowFullscreenChange prepareExitSplitScreen(
? STAGE_TYPE_UNDEFINED : dismissTop, wct); !record.mContainShowFullscreenChange && isSplitScreenVisible()
? dismissTop : STAGE_TYPE_UNDEFINED, wct);
mSplitTransitions.startDismissTransition(wct, this, dismissTop, mSplitTransitions.startDismissTransition(wct, this, dismissTop,
EXIT_REASON_APP_FINISHED); EXIT_REASON_APP_FINISHED);
// This can happen in some pathological cases. For example: // This can happen in some pathological cases. For example: