am 63756956: Merge "Add callback to track and thumb drawables, propagate state in ASLD" into lmp-dev

* commit '637569566d2234b06e08d94acf4db1b0d3be6501':
  Add callback to track and thumb drawables, propagate state in ASLD

1 files changed, 7 insertions, 2 deletions

diff --git a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java
index f7584d8..d78138bc 100644
--- a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java
+++ b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java
@@ -91,7 +91,8 @@ public class AnimatedStateListDrawable extends StateListDrawable {
             if (visible) {
                 mTransition.start();
             } else {
-                mTransition.stop();
+                // Ensure we're showing the correct state when visible.
+                jumpToCurrentState();
             }
         }
 
@@ -140,7 +141,11 @@ public class AnimatedStateListDrawable extends StateListDrawable {
     protected boolean onStateChange(int[] stateSet) {
         final int keyframeIndex = mState.indexOfKeyframe(stateSet);
         if (keyframeIndex == getCurrentIndex()) {
-            // No transition needed.
+            // Propagate state change to current keyframe.
+            final Drawable current = getCurrent();
+            if (current != null) {
+                return current.setState(stateSet);
+            }
             return false;
         }