commit 04019ee91b308cb9cce6fc284122aaa5f93e6b11
author Alan Viverette <alanv@google.com> Mon Aug 18 22:25:48 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 18 21:31:41 2014 +0000
tree 0b674dd57787fd5e091f60a7c32224f766f9bd22
parent 32e966ccb3da268af7b0ecdf5987d10700600473
parent 0bece71ee24f75967b86de47cae07e6fc04b4b36

Merge "Throw exception when inset drawable is missing drawable attribute" into lmp-dev

graphics/java/android/graphics/drawable/InsetDrawable.java

diff --git a/graphics/java/android/graphics/drawable/InsetDrawable.java b/graphics/java/android/graphics/drawable/InsetDrawable.java
index 588e776..dd0f06f 100644
--- a/graphics/java/android/graphics/drawable/InsetDrawable.java
+++ b/graphics/java/android/graphics/drawable/InsetDrawable.java
@@ -26,10 +26,13 @@
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.content.res.Resources.Theme;
-import android.graphics.*;
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.Insets;
+import android.graphics.Outline;
 import android.graphics.PorterDuff.Mode;
+import android.graphics.Rect;
 import android.util.AttributeSet;
-import android.util.Log;
 
 import java.io.IOException;
 
@@ -50,8 +53,6 @@
  * @attr ref android.R.styleable#InsetDrawable_insetBottom
  */
 public class InsetDrawable extends Drawable implements Drawable.Callback {
-    private static final String LOG_TAG = "InsetDrawable";
-
     private final Rect mTmpRect = new Rect();
 
     private InsetState mInsetState;
@@ -86,7 +87,6 @@
         final TypedArray a = r.obtainAttributes(attrs, R.styleable.InsetDrawable);
         super.inflateWithAttributes(r, parser, a, R.styleable.InsetDrawable_visible);
         updateStateFromTypedArray(a);
-        a.recycle();
 
         // Load inner XML elements.
         if (mInsetState.mDrawable == null) {
@@ -104,9 +104,17 @@
             dr.setCallback(this);
         }
 
-        // Verify state.
-        if (mInsetState.mDrawable == null) {
-            Log.w(LOG_TAG, "No drawable specified for <inset>");
+        verifyRequiredAttributes(a);
+        a.recycle();
+    }
+
+    private void verifyRequiredAttributes(TypedArray a) throws XmlPullParserException {
+        // If we're not waiting on a theme, verify required attributes.
+        if (mInsetState.mDrawable == null && (mInsetState.mThemeAttrs == null
+                || mInsetState.mThemeAttrs[R.styleable.InsetDrawable_drawable] == 0)) {
+            throw new XmlPullParserException(a.getPositionDescription() +
+                    ": <inset> tag requires a 'drawable' attribute or "
+                    + "child tag defining a drawable");
         }
     }
 
@@ -167,6 +175,7 @@
         final TypedArray a = t.resolveAttributes(state.mThemeAttrs, R.styleable.InsetDrawable);
         try {
             updateStateFromTypedArray(a);
+            verifyRequiredAttributes(a);
         } catch (XmlPullParserException e) {
             throw new RuntimeException(e);
         } finally {
@@ -224,12 +233,8 @@
         padding.top += mInsetState.mInsetTop;
         padding.bottom += mInsetState.mInsetBottom;
 
-        if (pad || (mInsetState.mInsetLeft | mInsetState.mInsetRight |
-                    mInsetState.mInsetTop | mInsetState.mInsetBottom) != 0) {
-            return true;
-        } else {
-            return false;
-        }
+        return pad || (mInsetState.mInsetLeft | mInsetState.mInsetRight |
+                mInsetState.mInsetTop | mInsetState.mInsetBottom) != 0;
     }
 
     /** @hide */