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

Merge "Make new task follow source task root" into sc-v2-dev am: 8172fc3e42 am: e34a978e4e

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

Change-Id: I9a269cea7bd6e67188b20a10cfa021f658f02953
This commit is contained in:
Tony Huang
2021-10-19 06:01:42 +00:00
committed by Automerger Merge Worker
parent f63482774b e34a978e4e
commit 169716d3e4
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/ActivityStarter.java
View File

@@ -2771,9 +2771,11 @@ class ActivityStarter {
// If it exist, we need to reparent target root task from TDA to launch root task.
final TaskDisplayArea tda = mTargetRootTask.getDisplayArea();
final Task launchRootTask = tda.getLaunchRootTask(mTargetRootTask.getWindowingMode(),
mTargetRootTask.getActivityType(), null /** options */, null /** sourceTask */,
0 /** launchFlags */);
if (launchRootTask != null && launchRootTask != mTargetRootTask) {
mTargetRootTask.getActivityType(), null /** options */,
mSourceRootTask, 0 /** launchFlags */);
// If target root task is created by organizer, let organizer handle reparent itself.
if (!mTargetRootTask.mCreatedByOrganizer && launchRootTask != null
&& launchRootTask != mTargetRootTask) {
mTargetRootTask.reparent(launchRootTask, POSITION_TOP);
mTargetRootTask = launchRootTask;
}

5
services/core/java/com/android/server/wm/TaskDisplayArea.java
View File

@@ -1209,6 +1209,11 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> {
}
}
}
// For better split UX, If task launch by the source task which root task is created by
// organizer, it should also launch in that root too.
if (sourceTask != null && sourceTask.getRootTask().mCreatedByOrganizer) {
return sourceTask.getRootTask();
}
return null;
}