summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/PreloadIconDrawable.java
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2014-08-29 17:20:55 -0700
committerSunny Goyal <sunnygoyal@google.com>2014-09-04 08:18:33 -0700
commit349426234e8c5a0e5bcf2c8d94dbb9844b5f724a (patch)
tree7959007f77fe9293898b72b57b4b28c87b90527e /src/com/android/launcher3/PreloadIconDrawable.java
parent6a2c77856f1cfa402363cfbb04b5718b431bbc6e (diff)
downloadandroid_packages_apps_Trebuchet-349426234e8c5a0e5bcf2c8d94dbb9844b5f724a.tar.gz
android_packages_apps_Trebuchet-349426234e8c5a0e5bcf2c8d94dbb9844b5f724a.tar.bz2
android_packages_apps_Trebuchet-349426234e8c5a0e5bcf2c8d94dbb9844b5f724a.zip
Handling label and icon from SessionInfo.
> The ShortcutInfo stores state as bit flags and not as ints > Intents of auto-install shortcut are automatically updated upon installation > Icons/titles for active sessions are cached in IconCache Change-Id: I2047849f67d4a8aaf2bc346b58110325bb4807d4
Diffstat (limited to 'src/com/android/launcher3/PreloadIconDrawable.java')
-rw-r--r--src/com/android/launcher3/PreloadIconDrawable.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/launcher3/PreloadIconDrawable.java b/src/com/android/launcher3/PreloadIconDrawable.java
index 1b2d5a4e3..2972c4f9b 100644
--- a/src/com/android/launcher3/PreloadIconDrawable.java
+++ b/src/com/android/launcher3/PreloadIconDrawable.java
@@ -189,11 +189,10 @@ 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 boolean maybePerformFinishedAnimation() {
+ public void maybePerformFinishedAnimation() {
if (mAnimationProgress > ANIMATION_PROGRESS_STOPPED) {
- return false;
+ return;
}
if (mAnimator != null) {
mAnimator.cancel();
@@ -202,7 +201,6 @@ class PreloadIconDrawable extends Drawable {
mAnimator = ObjectAnimator.ofFloat(this, "animationProgress",
ANIMATION_PROGRESS_STARTED, ANIMATION_PROGRESS_COMPLETED);
mAnimator.start();
- return true;
}
public void setAnimationProgress(float progress) {