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

Merge "Fix empty side stage after dropping foreground app icon to split" into sc-v2-dev

Browse Source
This commit is contained in:
Jerry Chang
2021-08-12 03:59:25 +00:00
committed by Android (Google) Code Review
parent 04a301b6de 51b387294d
commit 0b11b5e78d
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -375,7 +375,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
if (options == null) { if (options == null) {
options = new Bundle(); options = new Bundle();
} }
updateActivityOptions(options, position, wct); updateActivityOptions(options, position);
break; break;
} }
case STAGE_TYPE_MAIN: { case STAGE_TYPE_MAIN: {
@@ -390,7 +390,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
if (options == null) { if (options == null) {
options = new Bundle(); options = new Bundle();
} }
updateActivityOptions(options, position, wct); updateActivityOptions(options, position);
break; break;
} }
default: default:
@@ -491,22 +491,8 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
opts.putParcelable(KEY_LAUNCH_ROOT_TASK_TOKEN, stage.mRootTaskInfo.token); opts.putParcelable(KEY_LAUNCH_ROOT_TASK_TOKEN, stage.mRootTaskInfo.token);
} }
void updateActivityOptions(Bundle opts, @SplitPosition int position, void updateActivityOptions(Bundle opts, @SplitPosition int position) {
@Nullable WindowContainerTransaction wct) {
addActivityOptions(opts, position == mSideStagePosition ? mSideStage : mMainStage); addActivityOptions(opts, position == mSideStagePosition ? mSideStage : mMainStage);
if (!mMainStage.isActive()) {
// Activate the main stage in anticipation of an app launch.
boolean needsApply = wct == null;
if (needsApply) {
wct = new WindowContainerTransaction();
}
mMainStage.activate(getMainStageBounds(), wct);
mSideStage.setBounds(getSideStageBounds(), wct);
if (needsApply) {
mTaskOrganizer.applyTransaction(wct);
}
}
} }
void registerSplitScreenListener(SplitScreen.SplitScreenListener listener) { void registerSplitScreenListener(SplitScreen.SplitScreenListener listener) {