commit 4aae20d85a5c0fa6fe375240439b62e23641886e
author Dmitri Plotnikov <dplotnikov@google.com> Fri Nov 12 14:27:47 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 12 14:27:47 2010 -0800
tree 684883f7b91dff1d7e5c198773f9fd6231f0ebdd
parent f53efbfc942248604575e8f3706b78709d50f94a
parent 9ce839e2a86b1742682fdec69641c6ed9d665a06

Merge "New assets and layout in the contact filter pulldown"

src/com/android/contacts/widget/TransitionAnimationView.java

diff --git a/src/com/android/contacts/widget/TransitionAnimationView.java b/src/com/android/contacts/widget/TransitionAnimationView.java
index 938ff8a..1b86a6f 100644
--- a/src/com/android/contacts/widget/TransitionAnimationView.java
+++ b/src/com/android/contacts/widget/TransitionAnimationView.java
@@ -93,6 +93,7 @@
             throw new IllegalArgumentException("Invalid enter animation: " + mEnterAnimationId);
         }
         mEnterAnimation.addListener(this);
+        mEnterAnimation.setDuration(mAnimationDuration);
 
         mExitAnimation = AnimatorInflater.loadAnimator(getContext(), mExitAnimationId);
         if (mExitAnimation == null) {
@@ -150,19 +151,17 @@
             mPreviousStateView.setVisibility(View.VISIBLE);
 
             mEnterAnimation.setTarget(view);
-            mEnterAnimation.setDuration(mAnimationDuration);
             mEnterAnimation.start();
         }
     }
 
     @Override
-    public void onAnimationCancel(Animator animation) {
+    public void onAnimationEnd(Animator animation) {
         mPreviousStateView.setVisibility(View.INVISIBLE);
     }
 
     @Override
-    public void onAnimationEnd(Animator animation) {
-        mPreviousStateView.setVisibility(View.INVISIBLE);
+    public void onAnimationCancel(Animator animation) {
     }
 
     @Override