commit 159b4cc1e463ba730dbdff7c4ada2af01f35a1f1
author Michael Jurka <mikejurka@google.com> Tue Jan 17 03:00:35 2012 -0800
committer Michael Jurka <mikejurka@google.com> Tue Jan 17 03:13:53 2012 -0800
tree e1d122db1ef0a24d5ea78b16aa8713144d91383d
parent e3517d01ecb844b498d5862df07bc2177861806a

Cleaning up animation code

- replacing ValueAnimators with ObjectAnimators
- using ViewPropertyAnimator for All Apps->Workspace transition
- add multiple listener support to LauncherViewPropertyAnimator

Change-Id: I794dab6138fb23c5be963e2eb562965b5de857cf

src/com/android/launcher2/LauncherViewPropertyAnimator.java

diff --git a/src/com/android/launcher2/LauncherViewPropertyAnimator.java b/src/com/android/launcher2/LauncherViewPropertyAnimator.java
index b31179d..88b4cb4 100644
--- a/src/com/android/launcher2/LauncherViewPropertyAnimator.java
+++ b/src/com/android/launcher2/LauncherViewPropertyAnimator.java
@@ -50,19 +50,17 @@
     long mStartDelay;
     long mDuration;
     TimeInterpolator mInterpolator;
-    Animator.AnimatorListener mListener;
+    ArrayList<Animator.AnimatorListener> mListeners;
     boolean mRunning = false;
 
     public LauncherViewPropertyAnimator(View target) {
         mTarget = target;
+        mListeners = new ArrayList<Animator.AnimatorListener>();
     }
 
     @Override
     public void addListener(Animator.AnimatorListener listener) {
-        if (mListener != null) {
-            throw new RuntimeException("Only one listener supported");
-        }
-        mListener = listener;
+        mListeners.add(listener);
     }
 
     @Override
@@ -89,7 +87,7 @@
 
     @Override
     public ArrayList<Animator.AnimatorListener> getListeners() {
-        return null;
+        return mListeners;
     }
 
     @Override
@@ -99,31 +97,35 @@
 
     @Override
     public void onAnimationCancel(Animator animation) {
-        if (mListener != null) {
-            mListener.onAnimationCancel(this);
+        for (int i = 0; i < mListeners.size(); i++) {
+            Animator.AnimatorListener listener = mListeners.get(i);
+            listener.onAnimationCancel(this);
         }
         mRunning = false;
     }
 
     @Override
     public void onAnimationEnd(Animator animation) {
-        if (mListener != null) {
-            mListener.onAnimationEnd(this);
+        for (int i = 0; i < mListeners.size(); i++) {
+            Animator.AnimatorListener listener = mListeners.get(i);
+            listener.onAnimationEnd(this);
         }
         mRunning = false;
     }
 
     @Override
     public void onAnimationRepeat(Animator animation) {
-        if (mListener != null) {
-            mListener.onAnimationRepeat(this);
+        for (int i = 0; i < mListeners.size(); i++) {
+            Animator.AnimatorListener listener = mListeners.get(i);
+            listener.onAnimationRepeat(this);
         }
     }
 
     @Override
     public void onAnimationStart(Animator animation) {
-        if (mListener != null) {
-            mListener.onAnimationStart(this);
+        for (int i = 0; i < mListeners.size(); i++) {
+            Animator.AnimatorListener listener = mListeners.get(i);
+            listener.onAnimationStart(this);
         }
         mRunning = true;
     }
@@ -140,16 +142,12 @@
 
     @Override
     public void removeAllListeners() {
-        mListener = null;
+        mListeners.clear();
     }
 
     @Override
     public void removeListener(Animator.AnimatorListener listener) {
-        if (mListener == listener) {
-            mListener = null;
-        } else {
-            throw new RuntimeException("Removing listener that wasn't set");
-        }
+        mListeners.remove(listener);
     }
 
     @Override