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 am: 0b11b5e78d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15334939

Change-Id: I7df648a62c9c4020cac144bcfdf84fe58efd95c4
This commit is contained in:
Jerry Chang
2021-08-12 04:30:21 +00:00
committed by Automerger Merge Worker
parent 28f33f8fb8 0b11b5e78d
commit 348ed55ed8
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) {
options = new Bundle();
}
updateActivityOptions(options, position, wct);
updateActivityOptions(options, position);
break;
}
case STAGE_TYPE_MAIN: {
@@ -390,7 +390,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
if (options == null) {
options = new Bundle();
}
updateActivityOptions(options, position, wct);
updateActivityOptions(options, position);
break;
}
default:
@@ -491,22 +491,8 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
opts.putParcelable(KEY_LAUNCH_ROOT_TASK_TOKEN, stage.mRootTaskInfo.token);
}
void updateActivityOptions(Bundle opts, @SplitPosition int position,
@Nullable WindowContainerTransaction wct) {
void updateActivityOptions(Bundle opts, @SplitPosition int position) {
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) {