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

Merge "Finish converting tile usage to task-org" into rvc-dev am: ba592a2da0

Browse Source 
Change-Id: I2322a0d5412def8961603a8072d2366d6944d9d9
This commit is contained in:
Automerger Merge Worker
2020-03-10 16:13:04 +00:00
parent 48c18254a9 ba592a2da0
commit 9423adb3a3
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/wm/ActivityStack.java
View File

@@ -647,14 +647,6 @@ class ActivityStack extends Task {
if (prevWindowingMode != getWindowingMode()) { if (prevWindowingMode != getWindowingMode()) {
mDisplayContent.onStackWindowingModeChanged(this); 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(); final DisplayContent display = getDisplay();
@@ -3883,9 +3875,10 @@ class ActivityStack extends Task {
return; return;
} }
if (mTile != null) { 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) { } else if (mTile == null && origTile != null) {
reparentSurfaceControl(getPendingTransaction(), getParentSurfaceControl()); mSurfaceAnimator.reparent(getPendingTransaction(), getParentSurfaceControl());
} }
} }

12
services/core/java/com/android/server/wm/Task.java
View File

@@ -3971,12 +3971,12 @@ class Task extends WindowContainer<WindowContainer> {
boolean isControlledByTaskOrganizer() { boolean isControlledByTaskOrganizer() {
final Task rootTask = getRootTask(); final Task rootTask = getRootTask();
return rootTask == this && rootTask.mTaskOrganizer != null // if the rootTask is a "child" of a tile, then don't consider it a root task.
// TODO(task-hierarchy): Figure out how to control nested tasks. // TODO: remove this along with removing tile.
// For now, if this is in a tile let WM drive. if (((ActivityStack) rootTask).getTile() != null) {
&& !(rootTask instanceof TaskTile) return false;
&& !(rootTask instanceof ActivityStack }
&& ((ActivityStack) rootTask).getTile() != null); return rootTask == this && rootTask.mTaskOrganizer != null;
} }
@Override @Override