Merge "Re-hide shader mutation, remove colorfilter mutation" into oc-dev am: 0f9f0f90e7 (c8f8c6a7) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −17

Original line number	Diff line number	Diff line
		@@ -12601,7 +12601,6 @@ package android.graphics {

		public class BitmapShader extends android.graphics.Shader {
		ctor public BitmapShader(android.graphics.Bitmap, android.graphics.Shader.TileMode, android.graphics.Shader.TileMode);
		method public void set(android.graphics.Bitmap, android.graphics.Shader.TileMode, android.graphics.Shader.TileMode);
		}

		public class BlurMaskFilter extends android.graphics.MaskFilter {
		@@ -12854,8 +12853,6 @@ package android.graphics {
		ctor public ColorMatrixColorFilter(android.graphics.ColorMatrix);
		ctor public ColorMatrixColorFilter(float[]);
		method public void getColorMatrix(android.graphics.ColorMatrix);
		method public void setColorMatrix(android.graphics.ColorMatrix);
		method public void setColorMatrixArray(float[]);
		}

		public abstract class ColorSpace {
		@@ -12996,8 +12993,6 @@ package android.graphics {
		public class ComposeShader extends android.graphics.Shader {
		ctor public ComposeShader(android.graphics.Shader, android.graphics.Shader, android.graphics.Xfermode);
		ctor public ComposeShader(android.graphics.Shader, android.graphics.Shader, android.graphics.PorterDuff.Mode);
		method public void set(android.graphics.Shader, android.graphics.Shader, android.graphics.Xfermode);
		method public void set(android.graphics.Shader, android.graphics.Shader, android.graphics.PorterDuff.Mode);
		}

		public class CornerPathEffect extends android.graphics.PathEffect {
		@@ -13070,15 +13065,11 @@ package android.graphics {
		ctor public LightingColorFilter(int, int);
		method public int getColorAdd();
		method public int getColorMultiply();
		method public void setColorAdd(int);
		method public void setColorMultiply(int);
		}

		public class LinearGradient extends android.graphics.Shader {
		ctor public LinearGradient(float, float, float, float, int[], float[], android.graphics.Shader.TileMode);
		ctor public LinearGradient(float, float, float, float, int, int, android.graphics.Shader.TileMode);
		method public void set(float, float, float, float, int[], float[], android.graphics.Shader.TileMode);
		method public void set(float, float, float, float, int, int, android.graphics.Shader.TileMode);
		}

		public class MaskFilter {
		@@ -13588,10 +13579,6 @@ package android.graphics {

		public class PorterDuffColorFilter extends android.graphics.ColorFilter {
		ctor public PorterDuffColorFilter(int, android.graphics.PorterDuff.Mode);
		method public int getColor();
		method public android.graphics.PorterDuff.Mode getMode();
		method public void setColor(int);
		method public void setMode(android.graphics.PorterDuff.Mode);
		}

		public class PorterDuffXfermode extends android.graphics.Xfermode {
		@@ -13601,8 +13588,6 @@ package android.graphics {
		public class RadialGradient extends android.graphics.Shader {
		ctor public RadialGradient(float, float, float, int[], float[], android.graphics.Shader.TileMode);
		ctor public RadialGradient(float, float, float, int, int, android.graphics.Shader.TileMode);
		method public void set(float, float, float, int[], float[], android.graphics.Shader.TileMode);
		method public void set(float, float, float, int, int, android.graphics.Shader.TileMode);
		}

		public final class Rect implements android.os.Parcelable {
		@@ -13787,8 +13772,6 @@ package android.graphics {
		public class SweepGradient extends android.graphics.Shader {
		ctor public SweepGradient(float, float, int[], float[]);
		ctor public SweepGradient(float, float, int, int);
		method public void set(float, float, int[], float[]);
		method public void set(float, float, int, int);
		}

		public class Typeface {

api/system-current.txt

+0 −17

Original line number	Diff line number	Diff line
		@@ -13375,7 +13375,6 @@ package android.graphics {

		public class BitmapShader extends android.graphics.Shader {
		ctor public BitmapShader(android.graphics.Bitmap, android.graphics.Shader.TileMode, android.graphics.Shader.TileMode);
		method public void set(android.graphics.Bitmap, android.graphics.Shader.TileMode, android.graphics.Shader.TileMode);
		}

		public class BlurMaskFilter extends android.graphics.MaskFilter {
		@@ -13628,8 +13627,6 @@ package android.graphics {
		ctor public ColorMatrixColorFilter(android.graphics.ColorMatrix);
		ctor public ColorMatrixColorFilter(float[]);
		method public void getColorMatrix(android.graphics.ColorMatrix);
		method public void setColorMatrix(android.graphics.ColorMatrix);
		method public void setColorMatrixArray(float[]);
		}

		public abstract class ColorSpace {
		@@ -13770,8 +13767,6 @@ package android.graphics {
		public class ComposeShader extends android.graphics.Shader {
		ctor public ComposeShader(android.graphics.Shader, android.graphics.Shader, android.graphics.Xfermode);
		ctor public ComposeShader(android.graphics.Shader, android.graphics.Shader, android.graphics.PorterDuff.Mode);
		method public void set(android.graphics.Shader, android.graphics.Shader, android.graphics.Xfermode);
		method public void set(android.graphics.Shader, android.graphics.Shader, android.graphics.PorterDuff.Mode);
		}

		public class CornerPathEffect extends android.graphics.PathEffect {
		@@ -13844,15 +13839,11 @@ package android.graphics {
		ctor public LightingColorFilter(int, int);
		method public int getColorAdd();
		method public int getColorMultiply();
		method public void setColorAdd(int);
		method public void setColorMultiply(int);
		}

		public class LinearGradient extends android.graphics.Shader {
		ctor public LinearGradient(float, float, float, float, int[], float[], android.graphics.Shader.TileMode);
		ctor public LinearGradient(float, float, float, float, int, int, android.graphics.Shader.TileMode);
		method public void set(float, float, float, float, int[], float[], android.graphics.Shader.TileMode);
		method public void set(float, float, float, float, int, int, android.graphics.Shader.TileMode);
		}

		public class MaskFilter {
		@@ -14362,10 +14353,6 @@ package android.graphics {

		public class PorterDuffColorFilter extends android.graphics.ColorFilter {
		ctor public PorterDuffColorFilter(int, android.graphics.PorterDuff.Mode);
		method public int getColor();
		method public android.graphics.PorterDuff.Mode getMode();
		method public void setColor(int);
		method public void setMode(android.graphics.PorterDuff.Mode);
		}

		public class PorterDuffXfermode extends android.graphics.Xfermode {
		@@ -14375,8 +14362,6 @@ package android.graphics {
		public class RadialGradient extends android.graphics.Shader {
		ctor public RadialGradient(float, float, float, int[], float[], android.graphics.Shader.TileMode);
		ctor public RadialGradient(float, float, float, int, int, android.graphics.Shader.TileMode);
		method public void set(float, float, float, int[], float[], android.graphics.Shader.TileMode);
		method public void set(float, float, float, int, int, android.graphics.Shader.TileMode);
		}

		public final class Rect implements android.os.Parcelable {
		@@ -14561,8 +14546,6 @@ package android.graphics {
		public class SweepGradient extends android.graphics.Shader {
		ctor public SweepGradient(float, float, int[], float[]);
		ctor public SweepGradient(float, float, int, int);
		method public void set(float, float, int[], float[]);
		method public void set(float, float, int, int);
		}

		public class Typeface {

api/test-current.txt

+0 −17

Original line number	Diff line number	Diff line
		@@ -12643,7 +12643,6 @@ package android.graphics {

		public class BitmapShader extends android.graphics.Shader {
		ctor public BitmapShader(android.graphics.Bitmap, android.graphics.Shader.TileMode, android.graphics.Shader.TileMode);
		method public void set(android.graphics.Bitmap, android.graphics.Shader.TileMode, android.graphics.Shader.TileMode);
		}

		public class BlurMaskFilter extends android.graphics.MaskFilter {
		@@ -12896,8 +12895,6 @@ package android.graphics {
		ctor public ColorMatrixColorFilter(android.graphics.ColorMatrix);
		ctor public ColorMatrixColorFilter(float[]);
		method public void getColorMatrix(android.graphics.ColorMatrix);
		method public void setColorMatrix(android.graphics.ColorMatrix);
		method public void setColorMatrixArray(float[]);
		}

		public abstract class ColorSpace {
		@@ -13038,8 +13035,6 @@ package android.graphics {
		public class ComposeShader extends android.graphics.Shader {
		ctor public ComposeShader(android.graphics.Shader, android.graphics.Shader, android.graphics.Xfermode);
		ctor public ComposeShader(android.graphics.Shader, android.graphics.Shader, android.graphics.PorterDuff.Mode);
		method public void set(android.graphics.Shader, android.graphics.Shader, android.graphics.Xfermode);
		method public void set(android.graphics.Shader, android.graphics.Shader, android.graphics.PorterDuff.Mode);
		}

		public class CornerPathEffect extends android.graphics.PathEffect {
		@@ -13112,15 +13107,11 @@ package android.graphics {
		ctor public LightingColorFilter(int, int);
		method public int getColorAdd();
		method public int getColorMultiply();
		method public void setColorAdd(int);
		method public void setColorMultiply(int);
		}

		public class LinearGradient extends android.graphics.Shader {
		ctor public LinearGradient(float, float, float, float, int[], float[], android.graphics.Shader.TileMode);
		ctor public LinearGradient(float, float, float, float, int, int, android.graphics.Shader.TileMode);
		method public void set(float, float, float, float, int[], float[], android.graphics.Shader.TileMode);
		method public void set(float, float, float, float, int, int, android.graphics.Shader.TileMode);
		}

		public class MaskFilter {
		@@ -13630,10 +13621,6 @@ package android.graphics {

		public class PorterDuffColorFilter extends android.graphics.ColorFilter {
		ctor public PorterDuffColorFilter(int, android.graphics.PorterDuff.Mode);
		method public int getColor();
		method public android.graphics.PorterDuff.Mode getMode();
		method public void setColor(int);
		method public void setMode(android.graphics.PorterDuff.Mode);
		}

		public class PorterDuffXfermode extends android.graphics.Xfermode {
		@@ -13643,8 +13630,6 @@ package android.graphics {
		public class RadialGradient extends android.graphics.Shader {
		ctor public RadialGradient(float, float, float, int[], float[], android.graphics.Shader.TileMode);
		ctor public RadialGradient(float, float, float, int, int, android.graphics.Shader.TileMode);
		method public void set(float, float, float, int[], float[], android.graphics.Shader.TileMode);
		method public void set(float, float, float, int, int, android.graphics.Shader.TileMode);
		}

		public final class Rect implements android.os.Parcelable {
		@@ -13829,8 +13814,6 @@ package android.graphics {
		public class SweepGradient extends android.graphics.Shader {
		ctor public SweepGradient(float, float, int[], float[]);
		ctor public SweepGradient(float, float, int, int);
		method public void set(float, float, int[], float[]);
		method public void set(float, float, int, int);
		}

		public class Typeface {

graphics/java/android/graphics/BitmapShader.java

+1 −20

Original line number	Diff line number	Diff line
		@@ -41,35 +41,16 @@ public class BitmapShader extends Shader {
		* @param tileY The tiling mode for y to draw the bitmap in.
		*/
		public BitmapShader(@NonNull Bitmap bitmap, @NonNull TileMode tileX, @NonNull TileMode tileY) {
		set(bitmap, tileX, tileY);
		this(bitmap, tileX.nativeInt, tileY.nativeInt);
		}

		private BitmapShader(Bitmap bitmap, int tileX, int tileY) {
		setInternal(bitmap, tileX, tileY);
		}

		/**
		* Reinitialize the BitmapShader's Bitmap and tile modes.
		*
		* @param bitmap The bitmap to use inside the shader
		* @param tileX The tiling mode for x to draw the bitmap in.
		* @param tileY The tiling mode for y to draw the bitmap in.
		*/
		public void set(@NonNull Bitmap bitmap, @NonNull TileMode tileX, @NonNull TileMode tileY) {
		if (tileX == null \|\| tileY == null) {
		throw new IllegalArgumentException();
		}
		setInternal(bitmap, tileX.nativeInt, tileY.nativeInt);
		}

		private void setInternal(Bitmap bitmap, int tileX, int tileY) {
		if (bitmap == null) {
		throw new IllegalArgumentException("Bitmap must be non-null");
		}
		if (bitmap == mBitmap && tileX == mTileX && tileY == mTileY) {
		return;
		}
		discardNativeInstance();
		mBitmap = bitmap;
		mTileX = tileX;
		mTileY = tileY;

graphics/java/android/graphics/ColorMatrixColorFilter.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,8 @@ public class ColorMatrixColorFilter extends ColorFilter {
		* @see #getColorMatrix(ColorMatrix)
		* @see #setColorMatrixArray(float[])
		* @see ColorMatrix#reset()
		*
		* @hide
		*/
		public void setColorMatrix(@Nullable ColorMatrix matrix) {
		discardNativeInstance();
		@@ -99,6 +101,8 @@ public class ColorMatrixColorFilter extends ColorFilter {
		*
		* @throws ArrayIndexOutOfBoundsException if the specified array's
		* length is < 20
		*
		* @hide
		*/
		public void setColorMatrixArray(@Nullable float[] array) {
		// called '...Array' so that passing null isn't ambiguous