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

am 667ec63c: Merge "Don\'t propagate AnimatedStateListDrawable state change to super()" into lmp-mr1-dev

Browse Source 
* commit '667ec63c9ed695ca71f6639f18c31995fb8ff880':
  Don't propagate AnimatedStateListDrawable state change to super()
This commit is contained in:
Alan Viverette
2014-11-12 22:46:14 +00:00
committed by Android Git Automerger
parent 3ba2c7c681 667ec63c9e
commit 5f876974d0
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,12 +142,18 @@ public class AnimatedStateListDrawable extends StateListDrawable {
// 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()
boolean changed = targetIndex != getCurrentIndex()
&& (selectTransition(targetIndex) || selectDrawable(targetIndex));
// Always call super.onStateChanged() to propagate the state change to
// the current drawable.
return super.onStateChange(stateSet) || changedIndex;
// We need to propagate the state change to the current drawable, but
// we can't call StateListDrawable.onStateChange() without changing the
// current drawable.
final Drawable current = getCurrent();
if (current != null) {
changed |= current.setState(stateSet);
}
return changed;
}
private boolean selectTransition(int toIndex) {

11
graphics/java/android/graphics/drawable/AnimationDrawable.java
View File

@@ -285,7 +285,6 @@ public class AnimationDrawable extends DrawableContainer implements Runnable, An
private void inflateChildElements(Resources r, XmlPullParser parser, AttributeSet attrs,
Theme theme) throws XmlPullParserException, IOException {
TypedArray a;
int type;
final int innerDepth = parser.getDepth()+1;
@@ -300,7 +299,8 @@ public class AnimationDrawable extends DrawableContainer implements Runnable, An
continue;
}
a = obtainAttributes(r, theme, attrs, R.styleable.AnimationDrawableItem);
final TypedArray a = obtainAttributes(r, theme, attrs,
R.styleable.AnimationDrawableItem);
final int duration = a.getInt(R.styleable.AnimationDrawableItem_duration, -1);
if (duration < 0) {
@@ -308,14 +308,11 @@ public class AnimationDrawable extends DrawableContainer implements Runnable, An
+ ": <item> tag requires a 'duration' attribute");
}
final int drawableRes = a.getResourceId(R.styleable.AnimationDrawableItem_drawable, 0);
Drawable dr = a.getDrawable(R.styleable.AnimationDrawableItem_drawable);
a.recycle();
Drawable dr;
if (drawableRes != 0) {
dr = r.getDrawable(drawableRes, theme);
} else {
if (dr == null) {
while ((type=parser.next()) == XmlPullParser.TEXT) {
// Empty
}