Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0a8a3eab: am 46b4920a: Merge "Propagate state changes even when we don\'t change drawable index" into lmp-mr1-dev

Browse Source 
* commit '0a8a3eab8bfc3390e1225dfade40599279b4921b':
  Propagate state changes even when we don't change drawable index
This commit is contained in:
Alan Viverette
2014-10-21 18:29:02 +00:00
committed by Android Git Automerger
parent 1bb42f06e2 0a8a3eab8b
commit 2c861c782d
1 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java
View File

@@ -139,27 +139,15 @@ public class AnimatedStateListDrawable extends StateListDrawable {
@Override @Override
protected boolean onStateChange(int[] stateSet) { protected boolean onStateChange(int[] stateSet) {
final int keyframeIndex = mState.indexOfKeyframe(stateSet); // If we're not already at the target index, either attempt to find a
if (keyframeIndex == getCurrentIndex()) { // valid transition to it or jump directly there.
// Propagate state change to current keyframe. final int targetIndex = mState.indexOfKeyframe(stateSet);
final Drawable current = getCurrent(); final boolean changedIndex = targetIndex != getCurrentIndex()
if (current != null) { && (selectTransition(targetIndex) || selectDrawable(targetIndex));
return current.setState(stateSet);
}
return false;
}
// Attempt to find a valid transition to the keyframe. // Always call super.onStateChanged() to propagate the state change to
if (selectTransition(keyframeIndex)) { // the current drawable.
return true; return super.onStateChange(stateSet) || changedIndex;
}
// No valid transition, attempt to jump directly to the keyframe.
if (selectDrawable(keyframeIndex)) {
return true;
}
return super.onStateChange(stateSet);
} }
private boolean selectTransition(int toIndex) { private boolean selectTransition(int toIndex) {