commit 3759d1bc59550c4038f43c229e08d19f7155d8b7
author Sunny Goyal <sunnygoyal@google.com> Tue Aug 11 22:48:00 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 11 22:48:00 2015 +0000
tree 918351865c9ebf2466e80a2a1668cad88ea826f7
parent a410e992050d10bc3478eafa19dd76b0a1768254
parent b0d868f73037e0f732fa71d4bf557d4fcb1ed36c

am b0d868f7: Merge "Preventing zoom-in animation from running everytime the app updates." into ub-launcher3-burnaby

* commit 'b0d868f73037e0f732fa71d4bf557d4fcb1ed36c':
  Preventing zoom-in animation from running everytime the app updates.

src/com/android/launcher3/PreloadIconDrawable.java

diff --git a/src/com/android/launcher3/PreloadIconDrawable.java b/src/com/android/launcher3/PreloadIconDrawable.java
index bcb59c4..45e4b2c 100644
--- a/src/com/android/launcher3/PreloadIconDrawable.java
+++ b/src/com/android/launcher3/PreloadIconDrawable.java
@@ -213,6 +213,10 @@
         return mAnimationProgress;
     }
 
+    public boolean hasNotCompleted() {
+        return mAnimationProgress < ANIMATION_PROGRESS_COMPLETED;
+    }
+
     @Override
     public int getIntrinsicHeight() {
         return mIcon.getIntrinsicHeight();

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 1fbc779..a34711c 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -4293,8 +4293,9 @@
                         updates.contains(info)) {
                     ShortcutInfo si = (ShortcutInfo) info;
                     BubbleTextView shortcut = (BubbleTextView) v;
-                    boolean oldPromiseState = getTextViewIcon(shortcut)
-                            instanceof PreloadIconDrawable;
+                    Drawable oldIcon = getTextViewIcon(shortcut);
+                    boolean oldPromiseState = (oldIcon instanceof PreloadIconDrawable)
+                            && ((PreloadIconDrawable) oldIcon).hasNotCompleted();
                     shortcut.applyFromShortcutInfo(si, mIconCache,
                             si.isPromise() != oldPromiseState);