Merge "Fix some issues with taskbar" into sc-dev (e263a445) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/taskbar/TaskbarHotseatController.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@ public class TaskbarHotseatController {

		protected void init() {
		mLauncher.getDragController().addDragListener(mDragListener);
		onHotseatUpdated();
		}

		protected void cleanup() {

+7 −1

Original line number	Diff line number	Diff line
		@@ -50,6 +50,8 @@ public class TaskbarRecentsController {
		// The current background requests to load the task icons
		private CancellableTask[] mIconLoadRequests = new CancellableTask[mNumRecentIcons];

		private boolean mIsAlive;

		public TaskbarRecentsController(BaseQuickstepLauncher launcher,
		TaskbarController.TaskbarRecentsControllerCallbacks taskbarCallbacks) {
		mLauncher = launcher;
		@@ -58,11 +60,13 @@ public class TaskbarRecentsController {
		}

		protected void init() {
		mIsAlive = true;
		TaskStackChangeListeners.getInstance().registerTaskStackListener(mTaskStackChangeListener);
		reloadRecentTasksIfNeeded();
		}

		protected void cleanup() {
		mIsAlive = false;
		TaskStackChangeListeners.getInstance().unregisterTaskStackListener(
		mTaskStackChangeListener);
		cancelAllPendingIconLoadTasks();
		@@ -84,8 +88,10 @@ public class TaskbarRecentsController {
		}

		private void onRecentTasksChanged(ArrayList<Task> tasks) {
		if (mIsAlive) {
		mTaskbarCallbacks.updateRecentItems(tasks);
		}
		}

		/**
		* For each Task, loads its icon from the cache in the background, then calls