diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-08 04:06:59 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-08 04:06:59 +0000 |
commit | 729020d186406dffe3dc9300ee32a2ac974c4dff (patch) | |
tree | c938f4e3f154b8642c48e9f10dc0095647a4df43 | |
parent | 68277f0568ab668f02ec4b6aece3e8f75de865e2 (diff) | |
parent | 28254eec60526f27768a928c142f584b78965970 (diff) | |
download | android_packages_apps_Trebuchet-729020d186406dffe3dc9300ee32a2ac974c4dff.tar.gz android_packages_apps_Trebuchet-729020d186406dffe3dc9300ee32a2ac974c4dff.tar.bz2 android_packages_apps_Trebuchet-729020d186406dffe3dc9300ee32a2ac974c4dff.zip |
Merge "Insted of animating the icon of the first task, animating the running task icon" into ub-launcher3-edmonton
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<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); diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 6de6b0a22..82a5bdc98 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<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) { - 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 @@ -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); 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 |