commit 58d8be3ff47747454afdfadfe2f566a183cdee3b
author Dmitri Plotnikov <dplotnikov@google.com> Mon Nov 15 13:25:10 2010 -0800
committer Dmitri Plotnikov <dplotnikov@google.com> Mon Nov 15 13:25:10 2010 -0800
tree c79fb807d330dd2f602c0af4e71811789aa3ba80
parent 4597c92d655d45447780b32c7572acef110b6ed1

Resolving a race condition between animations

Bug: 3194333
Change-Id: I01cc841fc7b9e6ec037f8334de18cebf12d746a7

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 1b86a6f..114e97d 100644
--- a/src/com/android/contacts/widget/TransitionAnimationView.java
+++ b/src/com/android/contacts/widget/TransitionAnimationView.java
@@ -132,6 +132,12 @@
     }
 
     private void start(View view, boolean closing) {
+        if (mEnterAnimation.isRunning()) {
+            mEnterAnimation.end();
+        }
+        if (mExitAnimation.isRunning()) {
+            mExitAnimation.end();
+        }
         if (view.getVisibility() != View.VISIBLE) {
             if (!closing) {
                 mEnterAnimation.setTarget(view);