diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-09-12 13:46:42 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2011-09-12 13:49:52 -0700 |
| commit | f4ddea3df72fad2e0fb022cc7212d87d8cb69143 (patch) | |
| tree | 83bdfd21e7db7c0d01558fe5ea2ebf91f5b7bac4 /src/com/android/launcher2 | |
| parent | ac6d5db407496a01dda6df03f1491bfc98040228 (diff) | |
| download | android_packages_apps_Trebuchet-f4ddea3df72fad2e0fb022cc7212d87d8cb69143.tar.gz android_packages_apps_Trebuchet-f4ddea3df72fad2e0fb022cc7212d87d8cb69143.tar.bz2 android_packages_apps_Trebuchet-f4ddea3df72fad2e0fb022cc7212d87d8cb69143.zip | |
Fixing bug where wallpaper disappears
Change-Id: I50f57a9cec20079c36c65f85243c1c4bc16c7fb8
Diffstat (limited to 'src/com/android/launcher2')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 255bf06d6..532926a45 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2150,6 +2150,8 @@ public final class Launcher extends Activity ((LauncherTransitionable) toView).onLauncherTransitionStart(scaleAnim, false); } scaleAnim.addListener(new AnimatorListenerAdapter() { + boolean animationCancelled = false; + @Override public void onAnimationStart(Animator animation) { updateWallpaperVisibility(true); @@ -2175,7 +2177,13 @@ public final class Launcher extends Activity mWorkspace.hideScrollingIndicator(true); mWorkspace.hideDockDivider(true); } - updateWallpaperVisibility(false); + if (!animationCancelled) { + updateWallpaperVisibility(false); + } + } + + public void onAnimationCancel(Animator animation) { + animationCancelled = true; } }); |