commit ef468d80d8173d3b869b2b54a157396d3ea33c12
author Hyunyoung Song <hyunyoungs@google.com> Thu Jan 03 01:02:43 2019 -0800
committer Hyunyoung Song <hyunyoungs@google.com> Thu Jan 03 17:23:43 2019 -0800
tree 181cab4d3df2fec5eee83be535b30a8972c1cc22
parent efb8b836660bd367744c406b1a3ce7f20561e000

Do not animate icon if work profile is disabled
Bug: 119884907

Change-Id: I14977581dcb42b5fb2fe21f628a4d91945fdd614

src/com/android/launcher3/FastBitmapDrawable.java

diff --git a/src/com/android/launcher3/FastBitmapDrawable.java b/src/com/android/launcher3/FastBitmapDrawable.java
index daf587a..964e8b6 100644
--- a/src/com/android/launcher3/FastBitmapDrawable.java
+++ b/src/com/android/launcher3/FastBitmapDrawable.java
@@ -17,6 +17,7 @@
 package com.android.launcher3;
 
 import static com.android.launcher3.anim.Interpolators.ACCEL;
+import static com.android.launcher3.anim.Interpolators.DEACCEL;
 
 import android.animation.ObjectAnimator;
 import android.graphics.Bitmap;
@@ -221,8 +222,15 @@
                 mScaleAnimation.setInterpolator(ACCEL);
                 mScaleAnimation.start();
             } else {
-                mScale = 1f;
-                invalidateSelf();
+                if (isVisible()) {
+                    mScaleAnimation = ObjectAnimator.ofFloat(this, SCALE, 1f);
+                    mScaleAnimation.setDuration(CLICK_FEEDBACK_DURATION);
+                    mScaleAnimation.setInterpolator(DEACCEL);
+                    mScaleAnimation.start();
+                } else {
+                    mScale = 1f;
+                    invalidateSelf();
+                }
             }
             return true;
         }