Merge "Fix task icon not showing if you press home" into ub-launcher3-master (f2f08fc4) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/RecentsView.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -478,9 +478,7 @@ public class RecentsView extends PagedView implements Insettable {
		mRunningTaskId = runningTaskId;
		setCurrentPage(mFirstTaskIndex);
		if (mCurrentPage >= mFirstTaskIndex) {
		TaskView currentTask = (TaskView) getPageAt(mCurrentPage);
		currentTask.setIconScale(0);
		currentTask.setAlpha(0);
		getPageAt(mCurrentPage).setAlpha(0);
		}
		}

+9 −1

Original line number	Diff line number	Diff line
		@@ -569,6 +569,14 @@ public class WindowTransformSwipeHandler extends BaseSwipeInteractionHandler {
		*/
		private void notifyGestureStarted() {
		mLauncher.onQuickstepGestureStarted(mWasLauncherAlreadyVisible);

		mMainExecutor.execute(() -> {
		// Prepare to animate the first icon.
		View currentRecentsPage = mRecentsView.getPageAt(mRecentsView.getCurrentPage());
		if (currentRecentsPage instanceof TaskView) {
		((TaskView) currentRecentsPage).setIconScale(0f);
		}
		});
		}

		@WorkerThread
		@@ -673,7 +681,7 @@ public class WindowTransformSwipeHandler extends BaseSwipeInteractionHandler {
		// Re apply state in case we did something funky during the transition.
		mLauncher.getStateManager().reapplyState();

		// Animate ui the first icon.
		// Animate the first icon.
		View currentRecentsPage = mRecentsView.getPageAt(mRecentsView.getCurrentPage());
		if (currentRecentsPage instanceof TaskView) {
		((TaskView) currentRecentsPage).animateIconToScale(1f);