am 51547e75: am eba0a750: Merge "Clean up GradientDrawable styled attributes, fix useLevelForShape" into lmp-mr1-dev automerge: 91a1a72

* commit '51547e750e30801e2d367433d8cd59f6b77fdc8c':
  Clean up GradientDrawable styled attributes, fix useLevelForShape
This commit is contained in:
Alan Viverette
2014-10-25 02:36:06 +00:00
committed by Android Git Automerger

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;