commit d7c2f623fe92fd755c7810bceeb1749dc6e8130d
author Chet Haase <chet@google.com> Thu Aug 26 14:20:01 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 26 14:20:01 2010 -0700
tree cd06ee34ee3b9770bf3cadc6a643b49f4095843f
parent ba4da86add74aab16e3cf204dcf7ea25adbbaafa
parent f1b9b464216d2fac634be9c6aa8605d7c9ed5b68

Merge "Fix problems with early ending of Sequencer"

core/java/android/animation/Animator.java

diff --git a/core/java/android/animation/Animator.java b/core/java/android/animation/Animator.java
index 71b6d99..717fc0a 100755
--- a/core/java/android/animation/Animator.java
+++ b/core/java/android/animation/Animator.java
@@ -669,6 +669,7 @@
             setCurrentPlayTime(getCurrentPlayTime());
         }
         mPlayingState = STOPPED;
+        mStartedDelay = false;
         sPendingAnimations.add(this);
         if (sAnimationHandler == null) {
             sAnimationHandler = new AnimationHandler();

core/java/android/animation/Sequencer.java

diff --git a/core/java/android/animation/Sequencer.java b/core/java/android/animation/Sequencer.java
index a9e4e3b..63ec940 100644
--- a/core/java/android/animation/Sequencer.java
+++ b/core/java/android/animation/Sequencer.java
@@ -233,6 +233,10 @@
     @Override
     public void end() {
         mCanceled = true;
+        if (mSortedNodes.size() != mNodes.size()) {
+            // hasn't been started yet - sort the nodes now, then end them
+            sortNodes();
+        }
         if (mSortedNodes.size() > 0) {
             for (Node node : mSortedNodes) {
                 node.animation.end();