2/n Move task management logic to TaskContainers
Still no changes in logic, just moving the code around.
Bug: 152116619
Test: WM CTS and unit tests
Change-Id: I083b751c20fe110f120ae6c7626d3f2e974605ab
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index ce885ab..6921816 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -2357,7 +2357,7 @@
}
// Convert some windowing-mode changes into root-task reparents for split-screen.
if (stack.inSplitScreenWindowingMode()) {
- stack.getDisplay().onSplitScreenModeDismissed();
+ stack.getDisplay().mTaskContainers.onSplitScreenModeDismissed();
} else {
stack.setWindowingMode(windowingMode);
@@ -2775,7 +2775,8 @@
}
if (toTop) {
- display.positionStackAt(POSITION_TOP, primarySplitTask, false /* includingParents */);
+ display.mTaskContainers.positionStackAt(POSITION_TOP, primarySplitTask,
+ false /* includingParents */);
}
WindowContainerTransaction wct = new WindowContainerTransaction();
wct.reparent(task.getStack().mRemoteToken, primarySplitTask.mRemoteToken, toTop);
@@ -3244,8 +3245,8 @@
}
final ActivityStack stack = r.getRootTask();
- final Task task = stack.getDisplay().createStack(stack.getWindowingMode(),
- stack.getActivityType(), !ON_TOP, ainfo, intent,
+ final Task task = stack.getDisplay().mTaskContainers.createStack(
+ stack.getWindowingMode(), stack.getActivityType(), !ON_TOP, ainfo, intent,
false /* createdByOrganizer */);
if (!mRecentTasks.addToBottom(task)) {
@@ -3308,10 +3309,10 @@
throw new IllegalArgumentException("resizeTask not allowed on task=" + task);
}
if (bounds == null && stack.getWindowingMode() == WINDOWING_MODE_FREEFORM) {
- stack = stack.getDisplay().getOrCreateStack(
+ stack = stack.getDisplay().mTaskContainers.getOrCreateStack(
WINDOWING_MODE_FULLSCREEN, stack.getActivityType(), ON_TOP);
} else if (bounds != null && stack.getWindowingMode() != WINDOWING_MODE_FREEFORM) {
- stack = stack.getDisplay().getOrCreateStack(
+ stack = stack.getDisplay().mTaskContainers.getOrCreateStack(
WINDOWING_MODE_FREEFORM, stack.getActivityType(), ON_TOP);
}