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

Merge "Fix launch single task case if it under split roots" into tm-qpr-dev

Browse Source
This commit is contained in:
Tony Huang
2023-04-10 06:05:38 +00:00
committed by Android (Google) Code Review
parent 852833b280 3a68b02623
commit 09c1e20071
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -716,6 +716,10 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
if (options1 == null) options1 = new Bundle(); if (options1 == null) options1 = new Bundle();
if (taskId2 == INVALID_TASK_ID) { if (taskId2 == INVALID_TASK_ID) {
// Launching a solo task. // Launching a solo task.
// Exit split first if this task under split roots.
if (mMainStage.containsTask(taskId1) || mSideStage.containsTask(taskId1)) {
exitSplitScreen(null /* childrenToTop */, EXIT_REASON_RECREATE_SPLIT);
}
ActivityOptions activityOptions = ActivityOptions.fromBundle(options1); ActivityOptions activityOptions = ActivityOptions.fromBundle(options1);
activityOptions.update(ActivityOptions.makeRemoteAnimation(adapter)); activityOptions.update(ActivityOptions.makeRemoteAnimation(adapter));
options1 = activityOptions.toBundle(); options1 = activityOptions.toBundle();