Merge "LayoutLib: update logs to use new data bundle" into honeycomb (72fcd0a4) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -353,7 +353,7 @@ public class BitmapFactory {
		If it happened on close, bm is still valid.
		*/
		Bridge.getLog().error(LayoutLog.TAG_RESOURCES_READ,
		String.format("Error decoding bitmap of id 0x%x", id), e);
		String.format("Error decoding bitmap of id 0x%x", id), e, null /data/);
		} finally {
		try {
		if (is != null) is.close();
		@@ -454,7 +454,7 @@ public class BitmapFactory {
		if (is instanceof AssetManager.AssetInputStream) {
		Bridge.getLog().error(LayoutLog.TAG_UNSUPPORTED,
		"Bitmap.decodeStream: " +
		"InputStream is unsupported (AssetManager.AssetInputStream)");
		"InputStream is unsupported (AssetManager.AssetInputStream)", null /data/);
		return null;
		} else {
		// pass some temp storage down to the native code. 1024 is made up,

+2 −2

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@ public class BitmapShader_Delegate extends Shader_Delegate {
		canvasMatrix = xform.createInverse();
		} catch (java.awt.geom.NoninvertibleTransformException e) {
		Bridge.getLog().fidelityWarning(LayoutLog.TAG_MATRIX_INVERSE,
		"Unable to inverse matrix in BitmapShader", e);
		"Unable to inverse matrix in BitmapShader", e, null /data/);
		canvasMatrix = new java.awt.geom.AffineTransform();
		}

		@@ -123,7 +123,7 @@ public class BitmapShader_Delegate extends Shader_Delegate {
		localMatrix = localMatrix.createInverse();
		} catch (java.awt.geom.NoninvertibleTransformException e) {
		Bridge.getLog().fidelityWarning(LayoutLog.TAG_MATRIX_INVERSE,
		"Unable to inverse matrix in BitmapShader", e);
		"Unable to inverse matrix in BitmapShader", e, null /data/);
		localMatrix = new java.awt.geom.AffineTransform();
		}

+6 −4

Original line number	Diff line number	Diff line
		@@ -250,7 +250,7 @@ public final class Bitmap_Delegate {
		/package/ static boolean nativeCompress(int nativeBitmap, int format, int quality,
		OutputStream stream, byte[] tempStorage) {
		Bridge.getLog().error(LayoutLog.TAG_UNSUPPORTED,
		"Bitmap.compress() is not supported");
		"Bitmap.compress() is not supported", null /data/);
		return true;
		}

		@@ -386,7 +386,8 @@ public final class Bitmap_Delegate {
		// This is only called by Bitmap.CREATOR (Parcelable.Creator<Bitmap>), which is only
		// used during aidl call so really this should not be called.
		Bridge.getLog().error(LayoutLog.TAG_UNSUPPORTED,
		"AIDL is not suppored, and therefore Bitmaps cannot be created from parcels.");
		"AIDL is not suppored, and therefore Bitmaps cannot be created from parcels.",
		null /data/);
		return null;
		}

		@@ -395,7 +396,8 @@ public final class Bitmap_Delegate {
		// This is only called when sending a bitmap through aidl, so really this should not
		// be called.
		Bridge.getLog().error(LayoutLog.TAG_UNSUPPORTED,
		"AIDL is not suppored, and therefore Bitmaps cannot be written to parcels.");
		"AIDL is not suppored, and therefore Bitmaps cannot be written to parcels.",
		null /data/);
		return false;
		}

		@@ -412,7 +414,7 @@ public final class Bitmap_Delegate {
		if (paint != null && paint.getMaskFilter() != null) {
		Bridge.getLog().fidelityWarning(LayoutLog.TAG_MASKFILTER,
		"MaskFilter not supported in Bitmap.extractAlpha",
		null);
		null, null /data/);
		}

		int alpha = paint != null ? paint.getAlpha() : 0xFF;

+2 −2

Original line number	Diff line number	Diff line
		@@ -425,7 +425,7 @@ public final class Canvas_Delegate {
		assert false;
		Bridge.getLog().fidelityWarning(LayoutLog.TAG_MATRIX_AFFINE,
		"android.graphics.Canvas#setMatrix(android.graphics.Matrix) only " +
		"supports affine transformations.", null);
		"supports affine transformations.", null, null /data/);
		}
		}

		@@ -494,7 +494,7 @@ public final class Canvas_Delegate {

		if (filterDelegate.isSupported() == false) {
		Bridge.getLog().fidelityWarning(LayoutLog.TAG_DRAWFILTER,
		filterDelegate.getSupportMessage(), null);
		filterDelegate.getSupportMessage(), null, null /data/);
		}
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -137,7 +137,7 @@ public final class LinearGradient_Delegate extends Gradient_Delegate {
		canvasMatrix = xform.createInverse();
		} catch (java.awt.geom.NoninvertibleTransformException e) {
		Bridge.getLog().fidelityWarning(LayoutLog.TAG_MATRIX_INVERSE,
		"Unable to inverse matrix in LinearGradient", e);
		"Unable to inverse matrix in LinearGradient", e, null /data/);
		canvasMatrix = new java.awt.geom.AffineTransform();
		}

		@@ -146,7 +146,7 @@ public final class LinearGradient_Delegate extends Gradient_Delegate {
		localMatrix = localMatrix.createInverse();
		} catch (java.awt.geom.NoninvertibleTransformException e) {
		Bridge.getLog().fidelityWarning(LayoutLog.TAG_MATRIX_INVERSE,
		"Unable to inverse matrix in LinearGradient", e);
		"Unable to inverse matrix in LinearGradient", e, null /data/);
		localMatrix = new java.awt.geom.AffineTransform();
		}