From 60b7c53ccc6384b65aaca77d97794e8f09e8cfc8 Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Sun, 16 Jan 2011 17:19:32 -0800
Subject: [PATCH] More changes to improve memory usage during rotation

---
 src/com/android/launcher2/Launcher.java  | 2 ++
 src/com/android/launcher2/Workspace.java | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 2281c84774..7fb643e6fc 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1521,6 +1521,8 @@ public final class Launcher extends Activity
         mWorkspace.removeAllViews();
         mWorkspace = null;
         mDragController = null;
+
+        ValueAnimator.clearAllAnimations();
     }
 
     @Override
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 3f3088f8ee..540b373c31 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -287,6 +287,7 @@ public class Workspace extends SmoothPagedView
                     mDrawCustomizeTrayBackground = false;
                 }
                 enableCacheUpdates();
+                mAnimator = null;
             }
         };
         mShrinkAnimationListener = new AnimatorListenerAdapter() {
@@ -297,6 +298,7 @@ public class Workspace extends SmoothPagedView
             @Override
             public void onAnimationEnd(Animator animation) {
                 enableCacheUpdates();
+                mAnimator = null;
             }
         };
         mSnapVelocity = 600;