Merge "Fixing merge issue from ag/830529" (6545fbfa) · Commits · e / os / android_frameworks_base

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -176,9 +176,6 @@ public class Task {

		/** Set the grouping */
		public void setGroup(TaskGrouping group) {
		if (group != null && this.group != null) {
		throw new RuntimeException("This task is already assigned to a group.");
		}
		this.group = group;
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -465,9 +465,8 @@ public class TaskStack {
		if (notifyStackChanges) {
		mCb.onStackTaskRemoved(this, task, i == (taskCount - 1), null);
		}
		} else {
		newTasks.add(task);
		}
		task.setGroup(null);
		}

		// Add any new tasks
		@@ -507,6 +506,8 @@ public class TaskStack {
		mHistoryTaskList.set(historyTasks);
		mRawTaskList.clear();
		mRawTaskList.addAll(newTasks);
		mGroups.clear();
		mAffinitiesGroups.clear();
		}

		/** Gets the front task */

+1 −0

Original line number	Diff line number	Diff line
		@@ -602,6 +602,7 @@ public class RecentsView extends FrameLayout {

		public final void onBusEvent(TaskStackUpdatedEvent event) {
		mStack.setTasks(event.stack.computeAllTasksList(), true /* notifyStackChanges */);
		mStack.createAffiliatedGroupings(getContext());
		}

		/**

+1 −0

Original line number	Diff line number	Diff line
		@@ -129,6 +129,7 @@ public class TaskViewThumbnail extends View {
		mBitmapShader = null;
		mDrawPaint.setShader(null);
		}
		invalidate();
		}

		/** Updates the paint to draw the thumbnail. */