Merge "Make TaskStackListener work in freeform mode" into udc-dev
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 5c20ced..8d671f7 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -4764,13 +4764,6 @@
mWindowManager.updateFocusedWindowLocked(UPDATE_FOCUS_NORMAL,
true /*updateInputWindows*/);
}
- if (task != prevFocusTask) {
- if (prevFocusTask != null) {
- mTaskChangeNotificationController.notifyTaskFocusChanged(
- prevFocusTask.mTaskId, false);
- }
- mTaskChangeNotificationController.notifyTaskFocusChanged(task.mTaskId, true);
- }
}
if (task != prevTask) {
mTaskSupervisor.mRecentTasks.add(task);
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index 10e4929..c2d7863 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -1290,12 +1290,12 @@
return null;
}
- void updateTaskMovement(boolean toTop, int position) {
+ void updateTaskMovement(boolean toTop, boolean toBottom, int position) {
EventLogTags.writeWmTaskMoved(mTaskId, getRootTaskId(), getDisplayId(), toTop ? 1 : 0,
position);
final TaskDisplayArea taskDisplayArea = getDisplayArea();
if (taskDisplayArea != null && isLeafTask()) {
- taskDisplayArea.onLeafTaskMoved(this, toTop);
+ taskDisplayArea.onLeafTaskMoved(this, toTop, toBottom);
}
if (isPersistable) {
mLastTimeMoved = System.currentTimeMillis();
@@ -2561,7 +2561,7 @@
final Task task = child.asTask();
if (task != null) {
- task.updateTaskMovement(toTop, position);
+ task.updateTaskMovement(toTop, position == POSITION_BOTTOM, position);
}
}
@@ -4323,6 +4323,8 @@
dispatchTaskInfoChangedIfNeeded(false /* force */);
final Task parentTask = getParent().asTask();
if (parentTask != null) parentTask.dispatchTaskInfoChangedIfNeeded(false /* force */);
+
+ mAtmService.getTaskChangeNotificationController().notifyTaskFocusChanged(mTaskId, hasFocus);
}
void onPictureInPictureParamsChanged() {
@@ -4655,13 +4657,9 @@
final Task lastFocusedTask = displayArea.getFocusedRootTask();
displayArea.positionChildAt(POSITION_BOTTOM, this, false /*includingParents*/);
displayArea.updateLastFocusedRootTask(lastFocusedTask, reason);
- mAtmService.getTaskChangeNotificationController().notifyTaskMovedToBack(
- getTaskInfo());
}
if (task != null && task != this) {
positionChildAtBottom(task);
- mAtmService.getTaskChangeNotificationController().notifyTaskMovedToBack(
- task.getTaskInfo());
}
return;
}
@@ -5923,7 +5921,7 @@
if (canBeLaunchedOnDisplay(newParent.getDisplayId())) {
reparent(newParent, onTop ? POSITION_TOP : POSITION_BOTTOM);
if (isLeafTask()) {
- newParent.onLeafTaskMoved(this, onTop);
+ newParent.onLeafTaskMoved(this, onTop, !onTop);
}
} else {
Slog.w(TAG, "Task=" + this + " can't reparent to " + newParent);
diff --git a/services/core/java/com/android/server/wm/TaskDisplayArea.java b/services/core/java/com/android/server/wm/TaskDisplayArea.java
index a0608db..8cbd553 100644
--- a/services/core/java/com/android/server/wm/TaskDisplayArea.java
+++ b/services/core/java/com/android/server/wm/TaskDisplayArea.java
@@ -403,7 +403,7 @@
this /* child */, true /* includingParents */);
}
- child.updateTaskMovement(moveToTop, targetPosition);
+ child.updateTaskMovement(moveToTop, moveToBottom, targetPosition);
// The insert position may be adjusted to non-top when there is always-on-top root task.
// Since the original position is preferred to be top, the root task should have higher
@@ -433,7 +433,12 @@
}
}
- void onLeafTaskMoved(Task t, boolean toTop) {
+ void onLeafTaskMoved(Task t, boolean toTop, boolean toBottom) {
+ if (toBottom) {
+ mAtmService.getTaskChangeNotificationController().notifyTaskMovedToBack(
+ t.getTaskInfo());
+ }
+
if (!toTop) {
if (t.mTaskId == mLastLeafTaskToFrontId) {
mLastLeafTaskToFrontId = INVALID_TASK_ID;