diff options
| author | 2021-08-12 04:45:30 +0000 | |
|---|---|---|
| committer | 2021-08-12 04:45:30 +0000 | |
| commit | 5e5e86463ca5d03c25a6ab016e7e922d2052c85c (patch) | |
| tree | 12148c3b80b4b4b8bafb42d859d62061c709c974 | |
| parent | 7e5c35b51aa25b7942fa2a8412c2c0c8ffaa7a34 (diff) | |
| parent | 348ed55ed8558d8382fd4dcb4f341b4467485827 (diff) | |
Merge "Fix empty side stage after dropping foreground app icon to split" into sc-v2-dev am: 0b11b5e78d am: 348ed55ed8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15334939
Change-Id: Id39ffd659a1c27f9ce9fa4eed2e74da1849f2b53
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java index 29e99175bed0..363a4b14005a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java @@ -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) { |