Merge "Defer calling the stack task removed callbacks. am: 6c8217ab30" into nyc-mr1-dev (e351f281) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java

+13 −9

Original line number	Diff line number	Diff line
		@@ -228,8 +228,8 @@ public class TaskStack {
		/**
		* Notifies when a task has been removed from the stack.
		*/
		void onStackTaskRemoved(TaskStack stack, Task removedTask, boolean wasFrontMostTask,
		Task newFrontMostTask, AnimationProps animation, boolean fromDockGesture);
		void onStackTaskRemoved(TaskStack stack, Task removedTask, Task newFrontMostTask,
		AnimationProps animation, boolean fromDockGesture);

		/**
		* Notifies when all tasks have been removed from the stack.
		@@ -609,12 +609,11 @@ public class TaskStack {
		*/
		public void removeTask(Task t, AnimationProps animation, boolean fromDockGesture) {
		if (mStackTaskList.contains(t)) {
		boolean wasFrontMostTask = (getStackFrontMostTask(false /* includeFreeform */) == t);
		removeTaskImpl(mStackTaskList, t);
		Task newFrontMostTask = getStackFrontMostTask(false /* includeFreeform */);
		if (mCb != null) {
		// Notify that a task has been removed
		mCb.onStackTaskRemoved(this, t, wasFrontMostTask, newFrontMostTask, animation,
		mCb.onStackTaskRemoved(this, t, newFrontMostTask, animation,
		fromDockGesture);
		}
		}
		@@ -648,6 +647,7 @@ public class TaskStack {
		ArrayMap<Task.TaskKey, Task> currentTasksMap = createTaskKeyMapFromList(mRawTaskList);
		ArrayMap<Task.TaskKey, Task> newTasksMap = createTaskKeyMapFromList(tasks);
		ArrayList<Task> addedTasks = new ArrayList<>();
		ArrayList<Task> removedTasks = new ArrayList<>();
		ArrayList<Task> allTasks = new ArrayList<>();

		// Disable notifications if there are no callbacks
		@@ -661,11 +661,7 @@ public class TaskStack {
		Task task = mRawTaskList.get(i);
		if (!newTasksMap.containsKey(task.key)) {
		if (notifyStackChanges) {
		// If we are notifying, then remove the task now, otherwise the raw task list
		// will be reset at the end of this method
		removeTask(task, AnimationProps.IMMEDIATE, false /* fromDockGesture */);
		mCb.onStackTaskRemoved(this, task, i == (taskCount - 1), null,
		AnimationProps.IMMEDIATE, false /* fromDockGesture */);
		removedTasks.add(task);
		}
		}
		task.setGroup(null);
		@@ -699,6 +695,14 @@ public class TaskStack {
		// Update the affiliated groupings
		createAffiliatedGroupings(context);

		// Only callback for the removed tasks after the stack has updated
		int removedTaskCount = removedTasks.size();
		Task newFrontMostTask = getStackFrontMostTask(false);
		for (int i = 0; i < removedTaskCount; i++) {
		mCb.onStackTaskRemoved(this, removedTasks.get(i), newFrontMostTask,
		AnimationProps.IMMEDIATE, false /* fromDockGesture */);
		}

		// Only callback for the newly added tasks after this stack has been updated
		int addedTaskCount = addedTasks.size();
		for (int i = 0; i < addedTaskCount; i++) {

packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalGridView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -181,8 +181,8 @@ public class TaskStackHorizontalGridView extends HorizontalGridView implements T
		}

		@Override
		public void onStackTaskRemoved(TaskStack stack, Task removedTask, boolean wasFrontMostTask,
		Task newFrontMostTask, AnimationProps animation, boolean fromDockGesture) {
		public void onStackTaskRemoved(TaskStack stack, Task removedTask, Task newFrontMostTask,
		AnimationProps animation, boolean fromDockGesture) {
		((TaskStackHorizontalViewAdapter) getAdapter()).removeTask(removedTask);
		if (mFocusedTask == removedTask) {
		resetFocusedTask(removedTask);

packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1400,8 +1400,8 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
		* We expect that the {@link TaskView} associated with the removed task is already hidden.
		*/
		@Override
		public void onStackTaskRemoved(TaskStack stack, Task removedTask, boolean wasFrontMostTask,
		Task newFrontMostTask, AnimationProps animation, boolean fromDockGesture) {
		public void onStackTaskRemoved(TaskStack stack, Task removedTask, Task newFrontMostTask,
		AnimationProps animation, boolean fromDockGesture) {
		if (mFocusedTask == removedTask) {
		resetFocusedTask(removedTask);
		}