commit f4ddea3df72fad2e0fb022cc7212d87d8cb69143
author Adam Cohen <adamcohen@google.com> Mon Sep 12 13:46:42 2011 -0700
committer Adam Cohen <adamcohen@google.com> Mon Sep 12 13:49:52 2011 -0700
tree 83bdfd21e7db7c0d01558fe5ea2ebf91f5b7bac4
parent ac6d5db407496a01dda6df03f1491bfc98040228

Fixing bug where wallpaper disappears

Change-Id: I50f57a9cec20079c36c65f85243c1c4bc16c7fb8

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 255bf06..532926a 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2150,6 +2150,8 @@
                 ((LauncherTransitionable) toView).onLauncherTransitionStart(scaleAnim, false);
             }
             scaleAnim.addListener(new AnimatorListenerAdapter() {
+                boolean animationCancelled = false;
+
                 @Override
                 public void onAnimationStart(Animator animation) {
                     updateWallpaperVisibility(true);
@@ -2175,7 +2177,13 @@
                         mWorkspace.hideScrollingIndicator(true);
                         mWorkspace.hideDockDivider(true);
                     }
-                    updateWallpaperVisibility(false);
+                    if (!animationCancelled) {
+                        updateWallpaperVisibility(false);
+                    }
+                }
+
+                public void onAnimationCancel(Animator animation) {
+                    animationCancelled = true;
                 }
             });