Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 928debf59a 91a1a7296b
commit eba0a75091
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
graphics/java/android/graphics/drawable/GradientDrawable.java
View File

@@ -1552,14 +1552,15 @@ public class GradientDrawable extends Drawable {
public int mThickness = -1; public int mThickness = -1;
public boolean mDither = false; public boolean mDither = false;
private float mCenterX = 0.5f; float mCenterX = 0.5f;
private float mCenterY = 0.5f; float mCenterY = 0.5f;
private float mGradientRadius = 0.5f; float mGradientRadius = 0.5f;
private int mGradientRadiusType = RADIUS_TYPE_PIXELS; int mGradientRadiusType = RADIUS_TYPE_PIXELS;
private boolean mUseLevel; boolean mUseLevel = false;
private boolean mUseLevelForShape; boolean mUseLevelForShape = true;
private boolean mOpaqueOverBounds;
private boolean mOpaqueOverShape; boolean mOpaqueOverBounds;
boolean mOpaqueOverShape;
ColorStateList mTint = null; ColorStateList mTint = null;
PorterDuff.Mode mTintMode = DEFAULT_TINT_MODE; PorterDuff.Mode mTintMode = DEFAULT_TINT_MODE;