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

Merge "Don't dismiss split during enter if already visible" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-06-13 05:36:40 +00:00
committed by Android (Google) Code Review
parent 61730e62dd 0a4215b3c1
commit 1f23db5438
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1502,6 +1502,10 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
// Legacy transition we need to create divider here, shell transition case we will // Legacy transition we need to create divider here, shell transition case we will
// create it on #finishEnterSplitScreen // create it on #finishEnterSplitScreen
mSplitLayout.init(); mSplitLayout.init();
} else {
// We handle split visibility itself on shell transition, but sometimes we didn't
// reset it correctly after dismiss by some reason, so just set invisible before active.
setSplitsVisible(false);
} }
if (taskInfo != null) { if (taskInfo != null) {
setSideStagePosition(startPosition, wct); setSideStagePosition(startPosition, wct);
@@ -2642,11 +2646,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
if (mSplitTransitions.mPendingEnter.mExtraTransitType if (mSplitTransitions.mPendingEnter.mExtraTransitType
== TRANSIT_SPLIT_SCREEN_OPEN_TO_SIDE) { == TRANSIT_SPLIT_SCREEN_OPEN_TO_SIDE) {
// Open to side should only be used when split already active and foregorund.
if (mainChild == null && sideChild == null) { if (mainChild == null && sideChild == null) {
Log.w(TAG, "Launched a task in split, but didn't receive any task in transition."); Log.w(TAG, "Launched a task in split, but didn't receive any task in transition.");
mSplitTransitions.mPendingEnter.cancel((cancelWct, cancelT) // This should happen when the target app is already on front, so just cancel.
-> prepareExitSplitScreen(STAGE_TYPE_UNDEFINED, cancelWct)); mSplitTransitions.mPendingEnter.cancel(null);
mSplitUnsupportedToast.show();
return true; return true;
} }
} else { } else {