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

Merge "Only verify resolved theme attributes"

Browse Source
This commit is contained in:
Alan Viverette
2015-03-27 18:03:06 +00:00
committed by Android (Google) Code Review
parent 0043caf5bc ee7c65d539
commit acc6241da9
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
graphics/java/android/graphics/drawable/BitmapDrawable.java
View File

@@ -721,7 +721,7 @@ public class BitmapDrawable extends Drawable {
final TypedArray a = obtainAttributes(r, theme, attrs, R.styleable.BitmapDrawable);
updateStateFromTypedArray(a);
verifyState(a);
verifyRequiredAttributes(a);
a.recycle();
// Update local properties.
@@ -733,11 +733,13 @@ public class BitmapDrawable extends Drawable {
*
* @throws XmlPullParserException if any required attributes are missing
*/
private void verifyState(TypedArray a) throws XmlPullParserException {
private void verifyRequiredAttributes(TypedArray a) throws XmlPullParserException {
// If we're not waiting on a theme, verify required attributes.
final BitmapState state = mBitmapState;
if (state.mBitmap == null) {
if (state.mBitmap == null && (state.mThemeAttrs == null
|| state.mThemeAttrs[R.styleable.BitmapDrawable_src] == 0)) {
throw new XmlPullParserException(a.getPositionDescription() +
": <bitmap> requires a valid src attribute");
": <bitmap> requires a valid 'src' attribute");
}
}
@@ -759,7 +761,7 @@ public class BitmapDrawable extends Drawable {
final Bitmap bitmap = BitmapFactory.decodeResource(r, srcResId);
if (bitmap == null) {
throw new XmlPullParserException(a.getPositionDescription() +
": <bitmap> requires a valid src attribute");
": <bitmap> requires a valid 'src' attribute");
}
state.mBitmap = bitmap;