Merge "Finish converting tile usage to task-org" into rvc-dev
diff --git a/services/core/java/com/android/server/wm/ActivityStack.java b/services/core/java/com/android/server/wm/ActivityStack.java
index 0e391f0..9bad799 100644
--- a/services/core/java/com/android/server/wm/ActivityStack.java
+++ b/services/core/java/com/android/server/wm/ActivityStack.java
@@ -647,14 +647,6 @@
if (prevWindowingMode != getWindowingMode()) {
mDisplayContent.onStackWindowingModeChanged(this);
-
- if (inSplitScreenSecondaryWindowingMode()) {
- // When the stack is resized due to entering split screen secondary, offset the
- // windows to compensate for the new stack position.
- forAllWindows(w -> {
- w.mWinAnimator.setOffsetPositionForStackResize(true);
- }, true);
- }
}
final DisplayContent display = getDisplay();
@@ -3883,9 +3875,10 @@
return;
}
if (mTile != null) {
- reparentSurfaceControl(getPendingTransaction(), mTile.getSurfaceControl());
+ // don't use reparentSurfaceControl because we need to bypass taskorg check
+ mSurfaceAnimator.reparent(getPendingTransaction(), mTile.getSurfaceControl());
} else if (mTile == null && origTile != null) {
- reparentSurfaceControl(getPendingTransaction(), getParentSurfaceControl());
+ mSurfaceAnimator.reparent(getPendingTransaction(), getParentSurfaceControl());
}
}
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index 2d9a379..b2db99b 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -3971,12 +3971,12 @@
boolean isControlledByTaskOrganizer() {
final Task rootTask = getRootTask();
- return rootTask == this && rootTask.mTaskOrganizer != null
- // TODO(task-hierarchy): Figure out how to control nested tasks.
- // For now, if this is in a tile let WM drive.
- && !(rootTask instanceof TaskTile)
- && !(rootTask instanceof ActivityStack
- && ((ActivityStack) rootTask).getTile() != null);
+ // if the rootTask is a "child" of a tile, then don't consider it a root task.
+ // TODO: remove this along with removing tile.
+ if (((ActivityStack) rootTask).getTile() != null) {
+ return false;
+ }
+ return rootTask == this && rootTask.mTaskOrganizer != null;
}
@Override