diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 36bb821bbc418..4d5e45bae1c3d 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -5846,8 +5846,6 @@ - - diff --git a/graphics/java/android/graphics/drawable/MaskableIconDrawable.java b/graphics/java/android/graphics/drawable/MaskableIconDrawable.java index e4f1788a17eb7..472b22907823e 100644 --- a/graphics/java/android/graphics/drawable/MaskableIconDrawable.java +++ b/graphics/java/android/graphics/drawable/MaskableIconDrawable.java @@ -427,7 +427,7 @@ public class MaskableIconDrawable extends Drawable implements Drawable.Callback } if (type != XmlPullParser.START_TAG) { throw new XmlPullParserException(parser.getPositionDescription() - + ": or tag requires a 'color' or 'drawable'" + + ": or tag requires a 'drawable'" + "attribute or child tag defining a drawable"); } @@ -451,12 +451,6 @@ public class MaskableIconDrawable extends Drawable implements Drawable.Callback layer.mThemeAttrs = a.extractThemeAttrs(); Drawable dr = a.getDrawable(R.styleable.MaskableIconDrawableLayer_drawable); - if (dr == null) { - int color = a.getColor(R.styleable.MaskableIconDrawableLayer_color, Color.TRANSPARENT); - if (color != Color.TRANSPARENT) { - dr = new ColorDrawable(color); - } - } if (dr != null) { if (layer.mDrawable != null) { // It's possible that a drawable was already set, in which case