Merge "Clean up GradientDrawable styled attributes, fix useLevelForShape" into lmp-mr1-dev

automerge: 91a1a72

* commit '91a1a7296b776400b9c863ec094cd135614c6fbb':
  Clean up GradientDrawable styled attributes, fix useLevelForShape
This commit is contained in:
Alan Viverette
2014-10-24 21:40:04 +00:00
committed by android-build-merger

View File

@@ -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;