commit 8e95c9b5e614c4e7f5d8b0a4c40f889ef8d72299
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Sep 25 23:50:22 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 25 23:50:22 2018 +0000
tree 0a08802434d94b6c5e904939797c3f25aacaf281
parent 896860404545b583d7c8c71583a6e1862d17d3dc
parent 11137385a3a7d0afd58b69f0a0b037e255dde12f

Merge "Scaling down the icon in same path as scaling up" into ub-launcher3-master

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

diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index 1a9915c..d9626c4 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -280,7 +280,6 @@
             factory.createActivityController(RECENTS_LAUNCH_DURATION, INTERACTION_NORMAL);
             mActivity = activity;
             mRecentsView = mActivity.getOverviewPanel();
-            mRecentsView.setRunningTaskIconScaledDown(true);
             if (!mUserEventLogged) {
                 activity.getUserEventDispatcher().logActionCommand(Action.Command.RECENTS_BUTTON,
                         mHelper.getContainerType(), ContainerType.TASKSWITCHER);
@@ -298,6 +297,9 @@
             if (mListener != null) {
                 mListener.unregister();
             }
+            if (mRecentsView != null) {
+                mRecentsView.setRunningTaskIconScaledDown(true);
+            }
             AnimatorSet anim = new AnimatorSet();
             anim.addListener(new AnimationSuccessListener() {
                 @Override