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

Merge "Fix launch adjacent behavior if split background" into udc-dev

Browse Source
This commit is contained in:
Tony Huang
2023-05-26 02:40:05 +00:00
committed by Android (Google) Code Review
parent f74da6cc34 72cecb84f9
commit 741dd9144a
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2303,6 +2303,13 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
prepareExitSplitScreen(dismissTop, out); prepareExitSplitScreen(dismissTop, out);
mSplitTransitions.setDismissTransition(transition, dismissTop, mSplitTransitions.setDismissTransition(transition, dismissTop,
EXIT_REASON_APP_FINISHED); EXIT_REASON_APP_FINISHED);
} else if (!isSplitScreenVisible() && isOpening) {
// If split running backgroud and trigger task is appearing into split,
// prepare to enter split screen.
prepareEnterSplitScreen(out);
mSplitTransitions.setEnterTransition(transition, request.getRemoteTransition(),
null /* consumedCallback */, null /* finishedCallback */,
TRANSIT_SPLIT_SCREEN_PAIR_OPEN, !mIsDropEntering);
} }
} else if (isOpening && inFullscreen) { } else if (isOpening && inFullscreen) {
final int activityType = triggerTask.getActivityType(); final int activityType = triggerTask.getActivityType();
@@ -2328,7 +2335,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
prepareEnterSplitScreen(out); prepareEnterSplitScreen(out);
mSplitTransitions.setEnterTransition(transition, request.getRemoteTransition(), mSplitTransitions.setEnterTransition(transition, request.getRemoteTransition(),
null /* consumedCallback */, null /* finishedCallback */, null /* consumedCallback */, null /* finishedCallback */,
TRANSIT_SPLIT_SCREEN_OPEN_TO_SIDE, !mIsDropEntering); TRANSIT_SPLIT_SCREEN_PAIR_OPEN, !mIsDropEntering);
} }
} }
return out; return out;
@@ -2586,6 +2593,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
// First, verify that we actually have opened apps in both splits. // First, verify that we actually have opened apps in both splits.
TransitionInfo.Change mainChild = null; TransitionInfo.Change mainChild = null;
TransitionInfo.Change sideChild = null; TransitionInfo.Change sideChild = null;
final WindowContainerTransaction evictWct = new WindowContainerTransaction();
for (int iC = 0; iC < info.getChanges().size(); ++iC) { for (int iC = 0; iC < info.getChanges().size(); ++iC) {
final TransitionInfo.Change change = info.getChanges().get(iC); final TransitionInfo.Change change = info.getChanges().get(iC);
final ActivityManager.RunningTaskInfo taskInfo = change.getTaskInfo(); final ActivityManager.RunningTaskInfo taskInfo = change.getTaskInfo();
@@ -2594,12 +2602,16 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
continue; continue;
} }
final @StageType int stageType = getStageType(getStageOfTask(taskInfo)); final @StageType int stageType = getStageType(getStageOfTask(taskInfo));
if (stageType == STAGE_TYPE_MAIN if (mainChild == null && stageType == STAGE_TYPE_MAIN
&& (isOpeningType(change.getMode()) || change.getMode() == TRANSIT_CHANGE)) { && (isOpeningType(change.getMode()) || change.getMode() == TRANSIT_CHANGE)) {
// Includes TRANSIT_CHANGE to cover reparenting top-most task to split. // Includes TRANSIT_CHANGE to cover reparenting top-most task to split.
mainChild = change; mainChild = change;
} else if (stageType == STAGE_TYPE_SIDE && isOpeningType(change.getMode())) { } else if (sideChild == null && stageType == STAGE_TYPE_SIDE
&& isOpeningType(change.getMode())) {
sideChild = change; sideChild = change;
} else if (stageType != STAGE_TYPE_UNDEFINED && change.getMode() == TRANSIT_TO_BACK) {
// Collect all to back task's and evict them when transition finished.
evictWct.reparent(taskInfo.token, null /* parent */, false /* onTop */);
} }
} }
@@ -2661,6 +2673,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
mSideStage.evictInvisibleChildren(callbackWct); mSideStage.evictInvisibleChildren(callbackWct);
} }
} }
if (!evictWct.isEmpty()) {
callbackWct.merge(evictWct, true);
}
if (enterTransition.mResizeAnim) { if (enterTransition.mResizeAnim) {
mShowDecorImmediately = true; mShowDecorImmediately = true;
mSplitLayout.flingDividerToCenter(); mSplitLayout.flingDividerToCenter();