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

Merge "Only handle transition requests in split if active and visible" into udc-dev

Browse Source
This commit is contained in:
Winson Chung
2023-06-16 05:07:06 +00:00
committed by Android (Google) Code Review
parent c8e36828cc 32e6a38353
commit b88da3e9fc
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2365,6 +2365,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
prepareExitSplitScreen(STAGE_TYPE_UNDEFINED, out); prepareExitSplitScreen(STAGE_TYPE_UNDEFINED, out);
} }
} }
// When split in the background, it should be only opening/dismissing transition and
// would keep out not empty. Prevent intercepting all transitions for split screen when
// it is in the background and not identify to handle it.
return (!out.isEmpty() || isSplitScreenVisible()) ? out : null;
} else { } else {
if (isOpening && getStageOfTask(triggerTask) != null) { if (isOpening && getStageOfTask(triggerTask) != null) {
// One task is appearing into split, prepare to enter split screen. // One task is appearing into split, prepare to enter split screen.
@@ -2373,8 +2378,8 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
mSplitTransitions.setEnterTransition(transition, request.getRemoteTransition(), mSplitTransitions.setEnterTransition(transition, request.getRemoteTransition(),
TRANSIT_SPLIT_SCREEN_PAIR_OPEN, !mIsDropEntering); TRANSIT_SPLIT_SCREEN_PAIR_OPEN, !mIsDropEntering);
} }
return out;
} }
return out;
} }
/** /**