Merge "Fix native methods" (f22d01e8) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ public abstract class ColorFilter_Delegate {
		// ---- native methods ----

		@LayoutlibDelegate
		/package/ static void destroyFilter(long native_instance, long nativeColorFilter) {
		/package/ static void destroyFilter(long native_instance) {
		sManager.removeJavaReferenceFor(native_instance);
		}

+0 −6

Original line number	Diff line number	Diff line
		@@ -60,11 +60,5 @@ public class ColorMatrixColorFilter_Delegate extends ColorFilter_Delegate {
		return sManager.addNewDelegate(newDelegate);
		}

		@LayoutlibDelegate
		/package/ static long nColorMatrixFilter(long nativeFilter, float[] array) {
		// pass
		return 0;
		}

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -60,11 +60,5 @@ public class LightingColorFilter_Delegate extends ColorFilter_Delegate {
		return sManager.addNewDelegate(newDelegate);
		}

		@LayoutlibDelegate
		/package/ static int nCreateLightingFilter(long nativeFilter, int mul, int add) {
		// pass
		return 0;
		}

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

+0 −14

Original line number	Diff line number	Diff line
		@@ -490,20 +490,6 @@ public final class Path_Delegate {
		return new float[0];
		}

		@LayoutlibDelegate
		/package/ static long native_trim(long nPath, long nTargetPath, long nPathMeasure,
		float trimStart, float trimEnd, float trimOffset) {
		// TODO: add trim.
		Bridge.getLog().error(LayoutLog.TAG_UNSUPPORTED, "Path.trim() not supported", null);
		return nPathMeasure;

		}

		@LayoutlibDelegate
		private static void native_destroyMeasure(long nPathMeasure) {
		// Do nothing.
		}

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

		private void set(Path_Delegate delegate) {

+0 −7

Original line number	Diff line number	Diff line
		@@ -60,12 +60,5 @@ public class PorterDuffColorFilter_Delegate extends ColorFilter_Delegate {
		return sManager.addNewDelegate(newDelegate);
		}

		@LayoutlibDelegate
		/package/ static long nCreatePorterDuffFilter(long nativeFilter, int srcColor,
		int porterDuffMode) {
		// pass
		return 0;
		}

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