summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/PreloadIconDrawable.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/PreloadIconDrawable.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/PreloadIconDrawable.java')
-rw-r--r--src/com/android/launcher3/PreloadIconDrawable.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/PreloadIconDrawable.java b/src/com/android/launcher3/PreloadIconDrawable.java
index 2972c4f9b..1b2d5a4e3 100644
--- a/src/com/android/launcher3/PreloadIconDrawable.java
+++ b/src/com/android/launcher3/PreloadIconDrawable.java
@@ -189,10 +189,11 @@ class PreloadIconDrawable extends Drawable {
/**
* Runs the finish animation if it is has not been run after last level change.
+ * @return true if the animation was run.
*/
- public void maybePerformFinishedAnimation() {
+ public boolean maybePerformFinishedAnimation() {
if (mAnimationProgress > ANIMATION_PROGRESS_STOPPED) {
- return;
+ return false;
}
if (mAnimator != null) {
mAnimator.cancel();
@@ -201,6 +202,7 @@ class PreloadIconDrawable extends Drawable {
mAnimator = ObjectAnimator.ofFloat(this, "animationProgress",
ANIMATION_PROGRESS_STARTED, ANIMATION_PROGRESS_COMPLETED);
mAnimator.start();
+ return true;
}
public void setAnimationProgress(float progress) {