summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/BubbleTextView.java
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2014-08-25 16:02:46 -0700
committerSunny Goyal <sunnygoyal@google.com>2014-08-27 17:13:05 -0700
commit4f88bfb7af74930aee99e10abe3c0ad3ab54b06c (patch)
treef5dd80641e58df969be7325fdf0bdf137519fb59 /src/com/android/launcher3/BubbleTextView.java
parentd5058a534e1ec5cdf15682a604832c18f572299c (diff)
downloadandroid_packages_apps_Trebuchet-4f88bfb7af74930aee99e10abe3c0ad3ab54b06c.tar.gz
android_packages_apps_Trebuchet-4f88bfb7af74930aee99e10abe3c0ad3ab54b06c.tar.bz2
android_packages_apps_Trebuchet-4f88bfb7af74930aee99e10abe3c0ad3ab54b06c.zip
Clear the promise flag once the restore animation is run
and no more restore related tasks are pending issue: 17214102 Change-Id: I54c486ff001d74b4961f85947f41848cf92243a3
Diffstat (limited to 'src/com/android/launcher3/BubbleTextView.java')
-rw-r--r--src/com/android/launcher3/BubbleTextView.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 869b0ac88..d83f81dab 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -415,8 +415,10 @@ public class BubbleTextView extends TextView {
}
preloadDrawable.setLevel(progressLevel);
- if (state == ShortcutInfo.PACKAGE_STATE_DEFAULT) {
- preloadDrawable.maybePerformFinishedAnimation();
+ if ((state == ShortcutInfo.PACKAGE_STATE_DEFAULT) && info.wasPromise) {
+ // Clear the promise flag as it is no longer different than a normal shortcut,
+ // once the animation has been run.
+ info.wasPromise = !preloadDrawable.maybePerformFinishedAnimation();
}
}