diff options
| author | Chet Haase <chet@google.com> | 2014-09-03 14:55:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-03 14:55:30 +0000 |
| commit | 90ab04754032bd7fef8f453b5777bbd4e969e759 (patch) | |
| tree | c9b8c44e3e44a7ff16f0614a5b78ac273e27e7d2 /graphics | |
| parent | 66a75e5e916720a3d2cc691004b55183720c4f94 (diff) | |
| parent | 014e14b242848eaa86a10562e1c494143a0149aa (diff) | |
| download | frameworks_base-90ab04754032bd7fef8f453b5777bbd4e969e759.zip frameworks_base-90ab04754032bd7fef8f453b5777bbd4e969e759.tar.gz frameworks_base-90ab04754032bd7fef8f453b5777bbd4e969e759.tar.bz2 | |
Merge "Fix behavior of inflating InsetDrawable" into lmp-dev
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/drawable/InsetDrawable.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/drawable/InsetDrawable.java b/graphics/java/android/graphics/drawable/InsetDrawable.java index a20b6d8..384226f 100644 --- a/graphics/java/android/graphics/drawable/InsetDrawable.java +++ b/graphics/java/android/graphics/drawable/InsetDrawable.java @@ -86,6 +86,8 @@ public class InsetDrawable extends Drawable implements Drawable.Callback { throws XmlPullParserException, IOException { final TypedArray a = r.obtainAttributes(attrs, R.styleable.InsetDrawable); super.inflateWithAttributes(r, parser, a, R.styleable.InsetDrawable_visible); + + mInsetState.mDrawable = null; updateStateFromTypedArray(a); // Load inner XML elements. |