commit 327d5ce3592f485a0b4e92dd02335afe90979685
author Michael Jurka <mikejurka@google.com> Mon Oct 21 16:03:52 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 21 16:03:52 2013 -0700
tree 21798148fd9ce4ce8a0e0b93be621b62fb42d3d6
parent df087f53b692dca56bebedeead35682017064305
parent 4edc931562d94422c90c0d3d80eb0f54ee79c73f

am 4edc9315: Merge "Fix leak when animations are created but never started" into jb-ub-now-jetsonic

* commit '4edc931562d94422c90c0d3d80eb0f54ee79c73f':
  Fix leak when animations are created but never started

src/com/android/launcher3/LauncherAnimUtils.java

diff --git a/src/com/android/launcher3/LauncherAnimUtils.java b/src/com/android/launcher3/LauncherAnimUtils.java
index 01f72a7..5d4f9c6 100644
--- a/src/com/android/launcher3/LauncherAnimUtils.java
+++ b/src/com/android/launcher3/LauncherAnimUtils.java
@@ -30,6 +30,7 @@
     static HashSet<Animator> sAnimators = new HashSet<Animator>();
     static Animator.AnimatorListener sEndAnimListener = new Animator.AnimatorListener() {
         public void onAnimationStart(Animator animation) {
+            sAnimators.add(animation);
         }
 
         public void onAnimationRepeat(Animator animation) {
@@ -45,7 +46,6 @@
     };
 
     public static void cancelOnDestroyActivity(Animator a) {
-        sAnimators.add(a);
         a.addListener(sEndAnimListener);
     }