From a6e4a1757728efc91627ece602b0899d75303659 Mon Sep 17 00:00:00 2001
From: Chet Haase <chet@google.com>
Date: Fri, 23 Jul 2010 11:08:47 -0700
Subject: [PATCH] Sequencer now sends out onAnimationEnd() event correctly.

Previously, Sequencer did not detect child animation ending correctly, so it never sent an end event. This made it difficult to have nested sequencers.

Change-Id: I6c67d0846176191cf77a49c21a5ab9a00acb5159
---
 core/java/android/animation/Sequencer.java | 32 ++++++++++++++++------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/core/java/android/animation/Sequencer.java b/core/java/android/animation/Sequencer.java
index e73ac88313db3..74d81e9b94693 100644
--- a/core/java/android/animation/Sequencer.java
+++ b/core/java/android/animation/Sequencer.java
@@ -68,11 +68,6 @@ public final class Sequencer extends Animatable {
      */
     private final ArrayList<Node> mSortedNodes = new ArrayList<Node>();
 
-    /**
-     * The set of listeners to be sent events through the life of an animation.
-     */
-    private ArrayList<AnimatableListener> mListeners = null;
-
     /**
      * Flag indicating whether the nodes should be sorted prior to playing. This
      * flag allows us to cache the previous sorted nodes so that if the sequence
@@ -224,7 +219,6 @@ public final class Sequencer extends Animatable {
             if (mSequenceListener == null) {
                 mSequenceListener = new SequencerAnimatableListener(this);
             }
-            node.animation.addListener(mSequenceListener);
             if (node.dependencies == null || node.dependencies.size() == 0) {
                 nodesToStart.add(node);
             } else {
@@ -234,6 +228,7 @@ public final class Sequencer extends Animatable {
                 }
                 node.tmpDependencies = (ArrayList<Dependency>) node.dependencies.clone();
             }
+            node.animation.addListener(mSequenceListener);
         }
         // Now that all dependencies are set up, start the animations that should be started.
         for (Node node : nodesToStart) {
@@ -329,6 +324,7 @@ public final class Sequencer extends Animatable {
             if (mNode.tmpDependencies.size() == 0) {
                 // all dependencies satisfied: start the animation
                 mNode.animation.start();
+                mSequencer.mPlayingSet.add(mNode.animation);
             }
         }
 
@@ -356,9 +352,21 @@ public final class Sequencer extends Animatable {
         public void onAnimationEnd(Animatable animation) {
             animation.removeListener(this);
             mPlayingSet.remove(animation);
-            if (mPlayingSet.size() == 0) {
+            Node animNode = mSequencer.mNodeMap.get(animation);
+            animNode.done = true;
+            ArrayList<Node> sortedNodes = mSequencer.mSortedNodes;
+            int numNodes = sortedNodes.size();
+            int nodeIndex = sortedNodes.indexOf(animNode);
+            boolean allDone = true;
+            for (int i = nodeIndex + 1; i < numNodes; ++i) {
+                if (!sortedNodes.get(i).done) {
+                    allDone = false;
+                    break;
+                }
+            }
+            if (allDone) {
                 // If this was the last child animation to end, then notify listeners that this
-                // sequence ended
+                // sequencer has ended
                 if (mListeners != null) {
                     ArrayList<AnimatableListener> tmpListeners =
                             (ArrayList<AnimatableListener>) mListeners.clone();
@@ -435,6 +443,7 @@ public final class Sequencer extends Animatable {
                         }
                     }
                 }
+                node.done = false; // also reset done flag
             }
         }
     }
@@ -501,6 +510,13 @@ public final class Sequencer extends Animatable {
          */
         public ArrayList<Node> nodeDependents = null;
 
+        /**
+         * Flag indicating whether the animation in this node is finished. This flag
+         * is used by Sequencer to check, as each animation ends, whether all child animations
+         * are done and it's time to send out an end event for the entire Sequencer.
+         */
+        public boolean done = false;
+
         /**
          * Constructs the Node with the animation that it encapsulates. A Node has no
          * dependencies by default; dependencies are added via the addDependency()