Merge "Update delegates" into lmp-preview-dev (1a5b0de8) · Commits · e / os / android_frameworks_base

tools/layoutlib/bridge/src/android/graphics/BitmapShader_Delegate.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -79,13 +79,6 @@ public class BitmapShader_Delegate extends Shader_Delegate {
		return sManager.addNewDelegate(newDelegate);
		}

		@LayoutlibDelegate
		/package/ static long nativePostCreate(long native_shader, long native_bitmap,
		int shaderTileModeX, int shaderTileModeY) {
		// pass, not needed.
		return 0;
		}

		// ---- Private delegate/helper methods ----

		private BitmapShader_Delegate(java.awt.image.BufferedImage image,

+0 −13

Original line number	Diff line number	Diff line
		@@ -78,19 +78,6 @@ public class ComposeShader_Delegate extends Shader_Delegate {
		return sManager.addNewDelegate(newDelegate);
		}

		@LayoutlibDelegate
		/package/ static long nativePostCreate1(long native_shader, long native_skiaShaderA,
		long native_skiaShaderB, long native_mode) {
		// pass, not needed.
		return 0;
		}

		@LayoutlibDelegate
		/package/ static long nativePostCreate2(long native_shader, long native_skiaShaderA,
		long native_skiaShaderB, int porterDuffMode) {
		// pass, not needed.
		return 0;
		}

		// ---- Private delegate/helper methods ----

+0 −16

Original line number	Diff line number	Diff line
		@@ -71,22 +71,6 @@ public final class LinearGradient_Delegate extends Gradient_Delegate {
		tileMode);
		}

		@LayoutlibDelegate
		/package/ static long nativePostCreate1(LinearGradient thisGradient,
		long native_shader, float x0, float y0, float x1, float y1,
		int colors[], float positions[], int tileMode) {
		// nothing to be done here.
		return 0;
		}

		@LayoutlibDelegate
		/package/ static long nativePostCreate2(LinearGradient thisGradient,
		long native_shader, float x0, float y0, float x1, float y1,
		int color0, int color1, int tileMode) {
		// nothing to be done here.
		return 0;
		}

		// ---- Private delegate/helper methods ----

		/**

+0 −14

Original line number	Diff line number	Diff line
		@@ -68,20 +68,6 @@ public class RadialGradient_Delegate extends Gradient_Delegate {
		tileMode);
		}

		@LayoutlibDelegate
		/package/ static long nativePostCreate1(long native_shader, float x, float y, float radius,
		int colors[], float positions[], int tileMode) {
		// nothing to be done here.
		return 0;
		}

		@LayoutlibDelegate
		/package/ static long nativePostCreate2(long native_shader, float x, float y, float radius,
		int color0, int color1, int tileMode) {
		// nothing to be done here.
		return 0;
		}

		// ---- Private delegate/helper methods ----

		/**

+2 −3

Original line number	Diff line number	Diff line
		@@ -76,13 +76,12 @@ public abstract class Shader_Delegate {
		// ---- native methods ----

		@LayoutlibDelegate
		/package/ static void nativeDestructor(long native_shader, long native_skiaShader) {
		/package/ static void nativeDestructor(long native_shader) {
		sManager.removeJavaReferenceFor(native_shader);
		}

		@LayoutlibDelegate
		/package/ static void nativeSetLocalMatrix(long native_shader, long native_skiaShader,
		long matrix_instance) {
		/package/ static void nativeSetLocalMatrix(long native_shader, long matrix_instance) {
		// get the delegate from the native int.
		Shader_Delegate shaderDelegate = sManager.getDelegate(native_shader);
		if (shaderDelegate == null) {