Merge "Implemented API-review suggested changes on GradientDrawable" (0ab1f925) · Commits · e / os / android_frameworks_base

api/current.txt

+9 −9

Original line number	Diff line number	Diff line
		@@ -15446,38 +15446,38 @@ package android.graphics.drawable {
		method public float getGradientCenterY();
		method public float getGradientRadius();
		method public int getGradientType();
		method public int getInnerRadius();
		method @Px public int getInnerRadius();
		method public float getInnerRadiusRatio();
		method public int getOpacity();
		method public android.graphics.drawable.GradientDrawable.Orientation getOrientation();
		method public int getShape();
		method public int getThickness();
		method @Px public int getThickness();
		method public float getThicknessRatio();
		method public boolean getUseLevel();
		method public void setAlpha(int);
		method public void setColor(@ColorInt int);
		method public void setColor(@Nullable android.content.res.ColorStateList);
		method public void setColorFilter(@Nullable android.graphics.ColorFilter);
		method public void setColors(@ColorInt int[]);
		method public void setColors(@ColorInt int[], @Nullable float[]);
		method public void setColors(@Nullable @ColorInt int[]);
		method public void setColors(@Nullable @ColorInt int[], @Nullable float[]);
		method public void setCornerRadii(@Nullable float[]);
		method public void setCornerRadius(float);
		method public void setDither(boolean);
		method public void setGradientCenter(float, float);
		method public void setGradientRadius(float);
		method public void setGradientType(int);
		method public void setInnerRadius(int);
		method public void setInnerRadiusRatio(float);
		method public void setInnerRadius(@Px int);
		method public void setInnerRadiusRatio(@FloatRange(from=0.0f, fromInclusive=false) float);
		method public void setOrientation(android.graphics.drawable.GradientDrawable.Orientation);
		method public void setPadding(int, int, int, int);
		method public void setPadding(@Px int, @Px int, @Px int, @Px int);
		method public void setShape(int);
		method public void setSize(int, int);
		method public void setStroke(int, @ColorInt int);
		method public void setStroke(int, android.content.res.ColorStateList);
		method public void setStroke(int, @ColorInt int, float, float);
		method public void setStroke(int, android.content.res.ColorStateList, float, float);
		method public void setThickness(int);
		method public void setThicknessRatio(float);
		method public void setThickness(@Px int);
		method public void setThicknessRatio(@FloatRange(from=0.0f, fromInclusive=false) float);
		method public void setUseLevel(boolean);
		field public static final int LINE = 2; // 0x2
		field public static final int LINEAR_GRADIENT = 0; // 0x0

graphics/java/android/graphics/drawable/GradientDrawable.java

+19 −9

Original line number	Diff line number	Diff line
		@@ -17,9 +17,11 @@
		package android.graphics.drawable;

		import android.annotation.ColorInt;
		import android.annotation.FloatRange;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.Px;
		import android.annotation.UnsupportedAppUsage;
		import android.content.pm.ActivityInfo.Config;
		import android.content.res.ColorStateList;
		@@ -670,7 +672,7 @@ public class GradientDrawable extends Drawable {
		* @see #mutate()
		* @see #setColor(int)
		*/
		public void setColors(@ColorInt int[] colors) {
		public void setColors(@Nullable @ColorInt int[] colors) {
		setColors(colors, null);
		}

		@@ -690,7 +692,7 @@ public class GradientDrawable extends Drawable {
		* @see #mutate()
		* @see #setColors(int[])
		*/
		public void setColors(@ColorInt int[] colors, @Nullable float[] offsets) {
		public void setColors(@Nullable @ColorInt int[] colors, @Nullable float[] offsets) {
		mGradientState.setGradientColors(colors);
		mGradientState.mPositions = offsets;
		mGradientIsDirty = true;
		@@ -877,7 +879,11 @@ public class GradientDrawable extends Drawable {
		* @see #getInnerRadiusRatio()
		* @attr ref android.R.styleable#GradientDrawable_innerRadiusRatio
		*/
		public void setInnerRadiusRatio(float innerRadiusRatio) {
		public void setInnerRadiusRatio(
		@FloatRange(from = 0.0f, fromInclusive = false) float innerRadiusRatio) {
		if (innerRadiusRatio <= 0) {
		throw new IllegalArgumentException("Ratio must be greater than zero");
		}
		mGradientState.mInnerRadiusRatio = innerRadiusRatio;
		mPathIsDirty = true;
		invalidateSelf();
		@@ -899,7 +905,7 @@ public class GradientDrawable extends Drawable {
		* @see #getInnerRadius()
		* @attr ref android.R.styleable#GradientDrawable_innerRadius
		*/
		public void setInnerRadius(int innerRadius) {
		public void setInnerRadius(@Px int innerRadius) {
		mGradientState.mInnerRadius = innerRadius;
		mPathIsDirty = true;
		invalidateSelf();
		@@ -911,7 +917,7 @@ public class GradientDrawable extends Drawable {
		* @see #setInnerRadius(int)
		* @attr ref android.R.styleable#GradientDrawable_innerRadius
		*/
		public int getInnerRadius() {
		public @Px int getInnerRadius() {
		return mGradientState.mInnerRadius;
		}

		@@ -921,7 +927,11 @@ public class GradientDrawable extends Drawable {
		* @see #getThicknessRatio()
		* @attr ref android.R.styleable#GradientDrawable_thicknessRatio
		*/
		public void setThicknessRatio(float thicknessRatio) {
		public void setThicknessRatio(
		@FloatRange(from = 0.0f, fromInclusive = false) float thicknessRatio) {
		if (thicknessRatio <= 0) {
		throw new IllegalArgumentException("Ratio must be greater than zero");
		}
		mGradientState.mThicknessRatio = thicknessRatio;
		mPathIsDirty = true;
		invalidateSelf();
		@@ -942,7 +952,7 @@ public class GradientDrawable extends Drawable {
		*
		* @attr ref android.R.styleable#GradientDrawable_thickness
		*/
		public void setThickness(int thickness) {
		public void setThickness(@Px int thickness) {
		mGradientState.mThickness = thickness;
		mPathIsDirty = true;
		invalidateSelf();
		@@ -954,7 +964,7 @@ public class GradientDrawable extends Drawable {
		* @see #setThickness(int)
		* @attr ref android.R.styleable#GradientDrawable_thickness
		*/
		public int getThickness() {
		public @Px int getThickness() {
		return mGradientState.mThickness;
		}

		@@ -970,7 +980,7 @@ public class GradientDrawable extends Drawable {
		* @attr ref android.R.styleable#GradientDrawablePadding_right
		* @attr ref android.R.styleable#GradientDrawablePadding_bottom
		*/
		public void setPadding(int left, int top, int right, int bottom) {
		public void setPadding(@Px int left, @Px int top, @Px int right, @Px int bottom) {
		if (mGradientState.mPadding == null) {
		mGradientState.mPadding = new Rect();
		}