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

Merge "Move stack to front in-sync with task reparenting" into oc-dev

Browse Source 
am: c4555784be

Change-Id: Ia9ea6523bb84c8ca4fbdd02da888a3ffef8dc543
This commit is contained in:
Wale Ogunwale
2017-04-14 17:41:52 +00:00
committed by android-build-merger
parent 651a974dd1 c4555784be
commit 7654775b8a
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/am/TaskRecord.java
View File

@@ -658,7 +658,8 @@ final class TaskRecord extends ConfigurationContainer implements TaskWindowConta
// Must reparent first in window manager to avoid a situation where AM can delete the // Must reparent first in window manager to avoid a situation where AM can delete the
// we are coming from in WM before we reparent because it became empty. // we are coming from in WM before we reparent because it became empty.
mWindowContainerController.reparent(toStack.getWindowContainerController(), position); mWindowContainerController.reparent(toStack.getWindowContainerController(), position,
moveStackMode == REPARENT_MOVE_STACK_TO_FRONT);
// Move the task // Move the task
sourceStack.removeTask(this, reason, REMOVE_TASK_MODE_MOVING); sourceStack.removeTask(this, reason, REMOVE_TASK_MODE_MOVING);

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

@@ -184,7 +184,7 @@ class Task extends WindowContainer<AppWindowToken> implements DimLayer.DimLayerU
super.removeImmediately(); super.removeImmediately();
} }
void reparent(TaskStack stack, int position) { void reparent(TaskStack stack, int position, boolean moveParents) {
if (stack == mStack) { if (stack == mStack) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"task=" + this + " already child of stack=" + mStack); "task=" + this + " already child of stack=" + mStack);
@@ -195,7 +195,7 @@ class Task extends WindowContainer<AppWindowToken> implements DimLayer.DimLayerU
final DisplayContent prevDisplayContent = getDisplayContent(); final DisplayContent prevDisplayContent = getDisplayContent();
getParent().removeChild(this); getParent().removeChild(this);
stack.addTask(this, position, showForAllUsers(), false /* moveParents */); stack.addTask(this, position, showForAllUsers(), moveParents);
// Relayout display(s). // Relayout display(s).
final DisplayContent displayContent = stack.getDisplayContent(); final DisplayContent displayContent = stack.getDisplayContent();

4
services/core/java/com/android/server/wm/TaskWindowContainerController.java
View File

@@ -121,7 +121,7 @@ public class TaskWindowContainerController
} }
} }
public void reparent(StackWindowController stackController, int position) { public void reparent(StackWindowController stackController, int position, boolean moveParents) {
synchronized (mWindowMap) { synchronized (mWindowMap) {
if (DEBUG_STACK) Slog.i(TAG_WM, "reparent: moving taskId=" + mTaskId if (DEBUG_STACK) Slog.i(TAG_WM, "reparent: moving taskId=" + mTaskId
+ " to stack=" + stackController + " at " + position); + " to stack=" + stackController + " at " + position);
@@ -135,7 +135,7 @@ public class TaskWindowContainerController
throw new IllegalArgumentException("reparent: could not find stack=" throw new IllegalArgumentException("reparent: could not find stack="
+ stackController); + stackController);
} }
mContainer.reparent(stack, position); mContainer.reparent(stack, position, moveParents);
mContainer.getDisplayContent().layoutAndAssignWindowLayersIfNeeded(); mContainer.getDisplayContent().layoutAndAssignWindowLayersIfNeeded();
} }
} }

8
services/tests/servicestests/src/com/android/server/wm/TaskWindowContainerControllerTests.java
View File

@@ -89,7 +89,7 @@ public class TaskWindowContainerControllerTests extends WindowTestsBase {
boolean gotException = false; boolean gotException = false;
try { try {
taskController.reparent(stackController1, 0); taskController.reparent(stackController1, 0, false/* moveParents */);
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
gotException = true; gotException = true;
} }
@@ -100,14 +100,14 @@ public class TaskWindowContainerControllerTests extends WindowTestsBase {
stackController3.setContainer(null); stackController3.setContainer(null);
gotException = false; gotException = false;
try { try {
taskController.reparent(stackController3, 0); taskController.reparent(stackController3, 0, false/* moveParents */);
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
gotException = true; gotException = true;
} }
assertTrue("Should not be able to reparent to a stack that doesn't have a container", assertTrue("Should not be able to reparent to a stack that doesn't have a container",
gotException); gotException);
taskController.reparent(stackController2, 0); taskController.reparent(stackController2, 0, false/* moveParents */);
assertEquals(stackController2.mContainer, taskController.mContainer.getParent()); assertEquals(stackController2.mContainer, taskController.mContainer.getParent());
assertEquals(0, ((WindowTestUtils.TestTask) taskController.mContainer).positionInParent()); assertEquals(0, ((WindowTestUtils.TestTask) taskController.mContainer).positionInParent());
assertEquals(1, ((WindowTestUtils.TestTask) taskController2.mContainer).positionInParent()); assertEquals(1, ((WindowTestUtils.TestTask) taskController2.mContainer).positionInParent());
@@ -135,7 +135,7 @@ public class TaskWindowContainerControllerTests extends WindowTestsBase {
(WindowTestUtils.TestTask) taskController2.mContainer; (WindowTestUtils.TestTask) taskController2.mContainer;
// Reparent and check state // Reparent and check state
taskController.reparent(stack2Controller, 0); taskController.reparent(stack2Controller, 0, false /* moveParents */);
assertEquals(stack2, task1.getParent()); assertEquals(stack2, task1.getParent());
assertEquals(0, task1.positionInParent()); assertEquals(0, task1.positionInParent());
assertEquals(1, task2.positionInParent()); assertEquals(1, task2.positionInParent());