Merge "Insted of animating the icon of the first task, animating the running... (729020d1) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/quickstep/OverviewCommandHelper.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -267,7 +267,7 @@ public class OverviewCommandHelper {
		}
		mActivity = activity;
		mRecentsView = mActivity.getOverviewPanel();
		mRecentsView.setFirstTaskIconScaledDown(true /* isScaledDown /, false / animate */);
		mRecentsView.setRunningTaskIconScaledDown(true /* isScaledDown /, false / animate */);
		return false;
		}

		@@ -280,7 +280,7 @@ public class OverviewCommandHelper {
		@Override
		public void onAnimationSuccess(Animator animator) {
		if (mRecentsView != null) {
		mRecentsView.setFirstTaskIconScaledDown(false /* isScaledDown */,
		mRecentsView.setRunningTaskIconScaledDown(false /* isScaledDown */,
		true /* animate */);
		}
		}

quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -387,7 +387,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> {

		mRecentsView.showTask(mRunningTaskId);
		mRecentsView.setRunningTaskHidden(true);
		mRecentsView.setFirstTaskIconScaledDown(true /* isScaledDown /, false / animate */);
		mRecentsView.setRunningTaskIconScaledDown(true /* isScaledDown /, false / animate */);
		mLayoutListener.open();
		mStateCallback.setState(STATE_LAUNCHER_STARTED);
		}
		@@ -685,7 +685,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> {
		mLayoutListener.finish();

		mRecentsView.setRunningTaskHidden(false);
		mRecentsView.setFirstTaskIconScaledDown(false /* isScaledDown /, false / animate */);
		mRecentsView.setRunningTaskIconScaledDown(false /* isScaledDown /, false / animate */);
		}

		private void notifyTransitionCancelled() {
		@@ -749,7 +749,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> {
		mActivityControlHelper.onSwipeUpComplete(mActivity);

		// Animate the first icon.
		mRecentsView.setFirstTaskIconScaledDown(false /* isScaledDown /, true / animate */);
		mRecentsView.setRunningTaskIconScaledDown(false /* isScaledDown /, true / animate */);
		mRecentsView.setSwipeDownShouldLaunchApp(true);

		RecentsModel.getInstance(mContext).onOverviewShown(false, TAG);

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

+15 −13

Original line number	Diff line number	Diff line
		@@ -170,7 +170,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
		private boolean mRunningTaskTileHidden;
		private Task mTmpRunningTask;

		private boolean mFirstTaskIconScaledDown = false;
		private boolean mRunningTaskIconScaledDown = false;

		private boolean mOverviewStateEnabled;
		private boolean mTaskStackListenerRegistered;
		@@ -625,13 +625,15 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
		* Similar to {@link #showTask(int)} but does not put any restrictions on the first tile.
		*/
		public void setCurrentTask(int runningTaskId) {
		if (mRunningTaskTileHidden) {
		boolean runningTaskTileHidden = mRunningTaskTileHidden;
		boolean runningTaskIconScaledDown = mRunningTaskIconScaledDown;

		setRunningTaskIconScaledDown(false, false);
		setRunningTaskHidden(false);
		mRunningTaskId = runningTaskId;
		setRunningTaskHidden(true);
		} else {
		mRunningTaskId = runningTaskId;
		}
		setRunningTaskIconScaledDown(runningTaskIconScaledDown, false);
		setRunningTaskHidden(runningTaskTileHidden);

		setCurrentPage(0);

		// Load the tasks (if the loading is already
		@@ -659,17 +661,17 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
		return mQuickScrubController;
		}

		public void setFirstTaskIconScaledDown(boolean isScaledDown, boolean animate) {
		if (mFirstTaskIconScaledDown == isScaledDown) {
		public void setRunningTaskIconScaledDown(boolean isScaledDown, boolean animate) {
		if (mRunningTaskIconScaledDown == isScaledDown) {
		return;
		}
		mFirstTaskIconScaledDown = isScaledDown;
		mRunningTaskIconScaledDown = isScaledDown;
		applyIconScale(animate);
		}

		private void applyIconScale(boolean animate) {
		float scale = mFirstTaskIconScaledDown ? 0 : 1;
		TaskView firstTask = (TaskView) getChildAt(0);
		float scale = mRunningTaskIconScaledDown ? 0 : 1;
		TaskView firstTask = getTaskView(mRunningTaskId);
		if (firstTask != null) {
		if (animate) {
		firstTask.animateIconToScaleAndDim(scale);

quickstep/src/com/android/quickstep/views/TaskView.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -213,6 +213,7 @@ public class TaskView extends FrameLayout implements TaskCallbacks, PageCallback
		setTranslationY(0f);
		setTranslationZ(0);
		setAlpha(1f);
		setIconScaleAndDim(1);
		}

		@Override