diff options
| author | Alan Viverette <alanv@google.com> | 2014-10-24 21:17:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-24 21:17:43 +0000 |
| commit | 91a1a7296b776400b9c863ec094cd135614c6fbb (patch) | |
| tree | 49a506549d907d4e5e2a18c4ec80d67a70fa151c | |
| parent | cf96936966ae9506ce4151bf5bee276b5c7ea96b (diff) | |
| parent | 969ca91acd008cb33b72888e0b9e7109556db019 (diff) | |
| download | frameworks_base-91a1a7296b776400b9c863ec094cd135614c6fbb.zip frameworks_base-91a1a7296b776400b9c863ec094cd135614c6fbb.tar.gz frameworks_base-91a1a7296b776400b9c863ec094cd135614c6fbb.tar.bz2 | |
Merge "Clean up GradientDrawable styled attributes, fix useLevelForShape" into lmp-mr1-dev
| -rw-r--r-- | graphics/java/android/graphics/drawable/GradientDrawable.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java index f6a78f1..47e0e46 100644 --- a/graphics/java/android/graphics/drawable/GradientDrawable.java +++ b/graphics/java/android/graphics/drawable/GradientDrawable.java @@ -1552,14 +1552,15 @@ public class GradientDrawable extends Drawable { public int mThickness = -1; public boolean mDither = false; - private float mCenterX = 0.5f; - private float mCenterY = 0.5f; - private float mGradientRadius = 0.5f; - private int mGradientRadiusType = RADIUS_TYPE_PIXELS; - private boolean mUseLevel; - private boolean mUseLevelForShape; - private boolean mOpaqueOverBounds; - private boolean mOpaqueOverShape; + float mCenterX = 0.5f; + float mCenterY = 0.5f; + float mGradientRadius = 0.5f; + int mGradientRadiusType = RADIUS_TYPE_PIXELS; + boolean mUseLevel = false; + boolean mUseLevelForShape = true; + + boolean mOpaqueOverBounds; + boolean mOpaqueOverShape; ColorStateList mTint = null; PorterDuff.Mode mTintMode = DEFAULT_TINT_MODE; |