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

Merge "Propagate state changes even when we don't change drawable index" into lmp-mr1-dev

Browse Source
This commit is contained in:
Alan Viverette
2014-10-21 18:14:49 +00:00
committed by Android (Google) Code Review
parent a9a550dd8e f81c6af10e
commit 46b4920ac8
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
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;
}
// 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));
// 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);
// Always call super.onStateChanged() to propagate the state change to
// the current drawable.
return super.onStateChange(stateSet) || changedIndex;
}
private boolean selectTransition(int toIndex) {