Merge "Remove Shader#copy()" (81161248) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/BitmapShader.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -65,16 +65,6 @@ public class BitmapShader extends Shader {
		return nativeCreate(nativeMatrix, mBitmap, mTileX, mTileY);
		}

		/**
		* @hide
		*/
		@Override
		protected Shader copy() {
		final BitmapShader copy = new BitmapShader(mBitmap, mTileX, mTileY);
		copyLocalMatrix(copy);
		return copy;
		}

		private static native long nativeCreate(long nativeMatrix, Bitmap bitmap,
		int shaderTileModeX, int shaderTileModeY);
		}

+0 −11

Original line number	Diff line number	Diff line
		@@ -87,17 +87,6 @@ public class ComposeShader extends Shader {
		}
		}

		/**
		* @hide
		*/
		@Override
		protected Shader copy() {
		final ComposeShader copy = new ComposeShader(
		mShaderA.copy(), mShaderB.copy(), mPorterDuffMode);
		copyLocalMatrix(copy);
		return copy;
		}

		private static native long nativeCreate(long nativeMatrix,
		long nativeShaderA, long nativeShaderB, int porterDuffMode);
		}

+0 −11

Original line number	Diff line number	Diff line
		@@ -158,17 +158,6 @@ public class LinearGradient extends Shader {
		colorSpace().getNativeInstance());
		}

		/**
		* @hide
		*/
		@Override
		protected Shader copy() {
		final LinearGradient copy = new LinearGradient(mX0, mY0, mX1, mY1, mColorLongs,
		mPositions, mTileMode, colorSpace());
		copyLocalMatrix(copy);
		return copy;
		}

		private native long nativeCreate(long matrix, float x0, float y0, float x1, float y1,
		long[] colors, float[] positions, int tileMode, long colorSpaceHandle);
		}

+0 −11

Original line number	Diff line number	Diff line
		@@ -154,17 +154,6 @@ public class RadialGradient extends Shader {
		colorSpace().getNativeInstance());
		}

		/**
		* @hide
		*/
		@Override
		protected Shader copy() {
		final RadialGradient copy = new RadialGradient(mX, mY, mRadius, mColorLongs,
		mPositions, mTileMode, colorSpace());
		copyLocalMatrix(copy);
		return copy;
		}

		private static native long nativeCreate(long matrix, float x, float y, float radius,
		@ColorLong long[] colors, float[] positions, int tileMode, long colorSpaceHandle);
		}

+0 −15

Original line number	Diff line number	Diff line
		@@ -162,21 +162,6 @@ public class Shader {
		protected void verifyNativeInstance() {
		}

		/**
		* @hide
		*/
		protected Shader copy() {
		final Shader copy = new Shader();
		copyLocalMatrix(copy);
		return copy;
		}

		/**
		* @hide
		*/
		protected void copyLocalMatrix(Shader dest) {
		dest.mLocalMatrix.set(mLocalMatrix);
		}

		/**
		* @hide