From 28254eec60526f27768a928c142f584b78965970 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Mon, 7 May 2018 14:59:05 -0700 Subject: Insted of animating the icon of the first task, animating the running task icon Bug: 79236139 Change-Id: Ib85c22e3898c09a84d3a862c407c23d76a600d9d --- .../android/quickstep/OverviewCommandHelper.java | 4 ++-- .../quickstep/WindowTransformSwipeHandler.java | 6 ++--- .../com/android/quickstep/views/RecentsView.java | 28 ++++++++++++---------- .../src/com/android/quickstep/views/TaskView.java | 1 + 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java index 43772fb40..f0bdcbdc5 100644 --- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java +++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java @@ -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 */); } } diff --git a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java index 614ba6e68..2fa3875c3 100644 --- a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java +++ b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java @@ -387,7 +387,7 @@ public class WindowTransformSwipeHandler { 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 { 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 { 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); diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index ce460bc0d..5ecee6a60 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -170,7 +170,7 @@ public abstract class RecentsView extends PagedView impl private boolean mRunningTaskTileHidden; private Task mTmpRunningTask; - private boolean mFirstTaskIconScaledDown = false; + private boolean mRunningTaskIconScaledDown = false; private boolean mOverviewStateEnabled; private boolean mTaskStackListenerRegistered; @@ -638,13 +638,15 @@ public abstract class RecentsView 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) { - setRunningTaskHidden(false); - mRunningTaskId = runningTaskId; - setRunningTaskHidden(true); - } else { - mRunningTaskId = runningTaskId; - } + boolean runningTaskTileHidden = mRunningTaskTileHidden; + boolean runningTaskIconScaledDown = mRunningTaskIconScaledDown; + + setRunningTaskIconScaledDown(false, false); + setRunningTaskHidden(false); + mRunningTaskId = runningTaskId; + setRunningTaskIconScaledDown(runningTaskIconScaledDown, false); + setRunningTaskHidden(runningTaskTileHidden); + setCurrentPage(0); // Load the tasks (if the loading is already @@ -672,17 +674,17 @@ public abstract class RecentsView 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); diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java index 5fffb50c9..b8b9196e7 100644 --- a/quickstep/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/src/com/android/quickstep/views/TaskView.java @@ -213,6 +213,7 @@ public class TaskView extends FrameLayout implements TaskCallbacks, PageCallback setTranslationY(0f); setTranslationZ(0); setAlpha(1f); + setIconScaleAndDim(1); } @Override -- cgit v1.2.3