Merge "LayoutLib fixes for API 20 [DO NOT MERGE]" into klp-modular-dev (92b7c67e) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -102,7 +102,7 @@ import java.util.Set;
		}

		@LayoutlibDelegate
		/package/ static Bitmap nativeDecodeAsset(int asset, Rect padding, Options opts) {
		/package/ static Bitmap nativeDecodeAsset(long asset, Rect padding, Options opts) {
		opts.inBitmap = null;
		return null;
		}

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -344,7 +344,7 @@ public final class Canvas_Delegate {
		}

		@LayoutlibDelegate
		/package/ static long native_saveLayer(long nativeCanvas, RectF bounds,
		/package/ static int native_saveLayer(long nativeCanvas, RectF bounds,
		long paint, int layerFlags) {
		// get the delegate from the native int.
		Canvas_Delegate canvasDelegate = sManager.getDelegate(nativeCanvas);
		@@ -361,7 +361,7 @@ public final class Canvas_Delegate {
		}

		@LayoutlibDelegate
		/package/ static long native_saveLayer(long nativeCanvas, float l,
		/package/ static int native_saveLayer(long nativeCanvas, float l,
		float t, float r, float b,
		long paint, int layerFlags) {
		// get the delegate from the native int.
		@@ -380,7 +380,7 @@ public final class Canvas_Delegate {
		}

		@LayoutlibDelegate
		/package/ static long native_saveLayerAlpha(long nativeCanvas,
		/package/ static int native_saveLayerAlpha(long nativeCanvas,
		RectF bounds, int alpha,
		int layerFlags) {
		// get the delegate from the native int.
		@@ -393,7 +393,7 @@ public final class Canvas_Delegate {
		}

		@LayoutlibDelegate
		/package/ static long native_saveLayerAlpha(long nativeCanvas, float l,
		/package/ static int native_saveLayerAlpha(long nativeCanvas, float l,
		float t, float r, float b,
		int alpha, int layerFlags) {
		// get the delegate from the native int.
		@@ -786,7 +786,7 @@ public final class Canvas_Delegate {
		}

		@LayoutlibDelegate
		/package/ static void native_drawPath(long nativeCanvas, int path, long paint) {
		/package/ static void native_drawPath(long nativeCanvas, long path, long paint) {
		final Path_Delegate pathDelegate = Path_Delegate.getDelegate(path);
		if (pathDelegate == null) {
		return;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ public class LightingColorFilter_Delegate extends ColorFilter_Delegate {
		}

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

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -654,7 +654,7 @@ public final class Matrix_Delegate {
		}

		@LayoutlibDelegate
		/package/ static boolean native_invert(long native_object, int inverse) {
		/package/ static boolean native_invert(long native_object, long inverse) {
		Matrix_Delegate d = sManager.getDelegate(native_object);
		if (d == null) {
		return false;

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

+9 −9

Original line number	Diff line number	Diff line
		@@ -688,7 +688,7 @@ public class Paint_Delegate {
		}

		@LayoutlibDelegate
		/package/ static long native_getStyle(long native_object) {
		/package/ static int native_getStyle(long native_object) {
		// get the delegate from the native int.
		Paint_Delegate delegate = sManager.getDelegate(native_object);
		if (delegate == null) {
		@@ -710,7 +710,7 @@ public class Paint_Delegate {
		}

		@LayoutlibDelegate
		/package/ static long native_getStrokeCap(long native_object) {
		/package/ static int native_getStrokeCap(long native_object) {
		// get the delegate from the native int.
		Paint_Delegate delegate = sManager.getDelegate(native_object);
		if (delegate == null) {
		@@ -732,7 +732,7 @@ public class Paint_Delegate {
		}

		@LayoutlibDelegate
		/package/ static long native_getStrokeJoin(long native_object) {
		/package/ static int native_getStrokeJoin(long native_object) {
		// get the delegate from the native int.
		Paint_Delegate delegate = sManager.getDelegate(native_object);
		if (delegate == null) {
		@@ -889,7 +889,7 @@ public class Paint_Delegate {
		}

		@LayoutlibDelegate
		/package/ static long native_getTextAlign(long native_object) {
		/package/ static int native_getTextAlign(long native_object) {
		// get the delegate from the native int.
		Paint_Delegate delegate = sManager.getDelegate(native_object);
		if (delegate == null) {
		@@ -922,7 +922,7 @@ public class Paint_Delegate {
		}

		@LayoutlibDelegate
		/package/ static long native_getTextWidths(long native_object, char[] text, int index,
		/package/ static int native_getTextWidths(long native_object, char[] text, int index,
		int count, int bidiFlags, float[] widths) {
		// get the delegate from the native int.
		Paint_Delegate delegate = sManager.getDelegate(native_object);
		@@ -964,14 +964,14 @@ public class Paint_Delegate {
		}

		@LayoutlibDelegate
		/package/ static long native_getTextWidths(long native_object, String text, int start,
		/package/ static int native_getTextWidths(long native_object, String text, int start,
		int end, int bidiFlags, float[] widths) {
		return native_getTextWidths(native_object, text.toCharArray(), start, end - start,
		bidiFlags, widths);
		}

		@LayoutlibDelegate
		/* package */static long native_getTextGlyphs(long native_object, String text, int start,
		/* package */static int native_getTextGlyphs(long native_object, String text, int start,
		int end, int contextStart, int contextEnd, int flags, char[] glyphs) {
		// FIXME
		return 0;
		@@ -1012,7 +1012,7 @@ public class Paint_Delegate {
		}

		@LayoutlibDelegate
		/package/ static long native_getTextRunCursor(Paint thisPaint, long native_object, char[] text,
		/package/ static int native_getTextRunCursor(Paint thisPaint, long native_object, char[] text,
		int contextStart, int contextLength, int flags, int offset, int cursorOpt) {
		// FIXME
		Bridge.getLog().fidelityWarning(LayoutLog.TAG_UNSUPPORTED,
		@@ -1021,7 +1021,7 @@ public class Paint_Delegate {
		}

		@LayoutlibDelegate
		/package/ static long native_getTextRunCursor(Paint thisPaint, long native_object, String text,
		/package/ static int native_getTextRunCursor(Paint thisPaint, long native_object, String text,
		int contextStart, int contextEnd, int flags, int offset, int cursorOpt) {
		// FIXME
		Bridge.getLog().fidelityWarning(LayoutLog.TAG_UNSUPPORTED,