diff options
Diffstat (limited to 'graphics/java/android/graphics/drawable/LayerDrawable.java')
| -rw-r--r-- | graphics/java/android/graphics/drawable/LayerDrawable.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/graphics/java/android/graphics/drawable/LayerDrawable.java b/graphics/java/android/graphics/drawable/LayerDrawable.java index a2f71e5..05a81de 100644 --- a/graphics/java/android/graphics/drawable/LayerDrawable.java +++ b/graphics/java/android/graphics/drawable/LayerDrawable.java @@ -163,7 +163,6 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { inflateLayers(r, parser, attrs, theme); ensurePadding(); - onStateChange(getState()); } /** @@ -211,7 +210,11 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { updateLayerFromTypedArray(layer, a); a.recycle(); - if (layer.mDrawable == null) { + // If the layer doesn't have a drawable or unresolved theme + // attribute for a drawable, attempt to parse one from the child + // element. + if (layer.mDrawable == null && (layer.mThemeAttrs == null || + layer.mThemeAttrs[R.styleable.LayerDrawableItem_drawable] == 0)) { while ((type = parser.next()) == XmlPullParser.TEXT) { } if (type != XmlPullParser.START_TAG) { @@ -303,7 +306,6 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { } ensurePadding(); - onStateChange(getState()); } @Override |