diff options
| author | Alan Viverette <alanv@google.com> | 2014-10-21 18:14:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-21 18:14:50 +0000 |
| commit | 46b4920ac85c5294174df9421eb9a69b0c9b5d55 (patch) | |
| tree | e50fa00cf460fad2a7680e7495af183d78b87d78 /graphics | |
| parent | a9a550dd8e87b33979670cf856838ba227500547 (diff) | |
| parent | f81c6af10ef3041eeddb4a4560611a17dd3d399b (diff) | |
| download | frameworks_base-46b4920ac85c5294174df9421eb9a69b0c9b5d55.zip frameworks_base-46b4920ac85c5294174df9421eb9a69b0c9b5d55.tar.gz frameworks_base-46b4920ac85c5294174df9421eb9a69b0c9b5d55.tar.bz2 | |
Merge "Propagate state changes even when we don't change drawable index" into lmp-mr1-dev
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java index 9bcad3e..849faec 100644 --- a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java @@ -139,27 +139,15 @@ public class AnimatedStateListDrawable extends StateListDrawable { @Override protected boolean onStateChange(int[] stateSet) { - final int keyframeIndex = mState.indexOfKeyframe(stateSet); - if (keyframeIndex == getCurrentIndex()) { - // Propagate state change to current keyframe. - final Drawable current = getCurrent(); - if (current != null) { - return current.setState(stateSet); - } - return false; - } - - // Attempt to find a valid transition to the keyframe. - if (selectTransition(keyframeIndex)) { - return true; - } - - // No valid transition, attempt to jump directly to the keyframe. - if (selectDrawable(keyframeIndex)) { - return true; - } - - return super.onStateChange(stateSet); + // If we're not already at the target index, either attempt to find a + // valid transition to it or jump directly there. + final int targetIndex = mState.indexOfKeyframe(stateSet); + final boolean changedIndex = targetIndex != getCurrentIndex() + && (selectTransition(targetIndex) || selectDrawable(targetIndex)); + + // Always call super.onStateChanged() to propagate the state change to + // the current drawable. + return super.onStateChange(stateSet) || changedIndex; } private boolean selectTransition(int toIndex) { |