diff options
| author | Romain Guy <romainguy@google.com> | 2012-10-03 18:47:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-03 18:47:35 -0700 |
| commit | f7ee2a03c1f930db4b20c04225f496ada97e646b (patch) | |
| tree | bdd44e34bd6dbec8006b96b7a0e2af68eb8e6115 /graphics | |
| parent | 6fb7fd3a0939413d8968fc0d404ed499d7f7dc52 (diff) | |
| parent | dfab363807b3b44be4032e410f016e0a0d018426 (diff) | |
| download | frameworks_base-f7ee2a03c1f930db4b20c04225f496ada97e646b.zip frameworks_base-f7ee2a03c1f930db4b20c04225f496ada97e646b.tar.gz frameworks_base-f7ee2a03c1f930db4b20c04225f496ada97e646b.tar.bz2 | |
Merge "Fix rendering artifacts on tiled renderers Bug #7275145" into jb-mr1-dev
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/drawable/ColorDrawable.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/drawable/ColorDrawable.java b/graphics/java/android/graphics/drawable/ColorDrawable.java index 4561397..d11e554 100644 --- a/graphics/java/android/graphics/drawable/ColorDrawable.java +++ b/graphics/java/android/graphics/drawable/ColorDrawable.java @@ -20,6 +20,7 @@ import android.graphics.*; import android.content.res.Resources; import android.content.res.TypedArray; import android.util.AttributeSet; +import android.view.ViewDebug; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -34,6 +35,7 @@ import java.io.IOException; * @attr ref android.R.styleable#ColorDrawable_color */ public class ColorDrawable extends Drawable { + @ViewDebug.ExportedProperty(deepExport = true, prefix = "state_") private ColorState mState; private final Paint mPaint = new Paint(); private boolean mMutated; @@ -174,6 +176,7 @@ public class ColorDrawable extends Drawable { final static class ColorState extends ConstantState { int mBaseColor; // base color, independent of setAlpha() + @ViewDebug.ExportedProperty int mUseColor; // basecolor modulated by setAlpha() int mChangingConfigurations; |