1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index e5c11de..4b8b682 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1525,6 +1525,8 @@ public final class Launcher extends Activity
         mWorkspace.removeAllViews();
         mWorkspace = null;
         mDragController = null;
+
+        ValueAnimator.clearAllAnimations();
     }
 
     @Override
@@ -2685,7 +2687,6 @@ public final class Launcher extends Activity
 
         if (toAllApps) {
             mWorkspace.shrink(ShrinkState.BOTTOM_HIDDEN, animated);
-            toView.setAlpha(0f);
         } else {
             mWorkspace.shrink(ShrinkState.TOP, animated);
         }
@@ -2698,6 +2699,7 @@ public final class Launcher extends Activity
             scaleAnim.setDuration(duration);
 
             if (toAllApps) {
+                toView.setAlpha(0f);
                 ObjectAnimator alphaAnim = ObjectAnimator.ofPropertyValuesHolder(toView,
                         PropertyValuesHolder.ofFloat("alpha", 1.0f));
                 alphaAnim.setInterpolator(new DecelerateInterpolator(1.5f));