diff options
Diffstat (limited to 'tools/layoutlib/bridge/src/android')
14 files changed, 45 insertions, 45 deletions
diff --git a/tools/layoutlib/bridge/src/android/graphics/BitmapFactory.java b/tools/layoutlib/bridge/src/android/graphics/BitmapFactory.java index eb9487e..7020d9c 100644 --- a/tools/layoutlib/bridge/src/android/graphics/BitmapFactory.java +++ b/tools/layoutlib/bridge/src/android/graphics/BitmapFactory.java @@ -16,9 +16,9 @@ package android.graphics; +import com.android.ide.common.rendering.api.LayoutLog; import com.android.ide.common.rendering.api.ResourceDensity; import com.android.layoutlib.bridge.Bridge; -import com.android.layoutlib.bridge.BridgeConstants; import android.content.res.AssetManager; import android.content.res.Resources; @@ -352,7 +352,7 @@ public class BitmapFactory { If the exception happened on open, bm will be null. If it happened on close, bm is still valid. */ - Bridge.getLog().error(BridgeConstants.TAG_RESOURCES_READ, + Bridge.getLog().error(LayoutLog.TAG_RESOURCES_READ, String.format("Error decoding bitmap of id 0x%x", id), e); } finally { try { @@ -452,7 +452,7 @@ public class BitmapFactory { Bitmap bm; if (is instanceof AssetManager.AssetInputStream) { - Bridge.getLog().error(BridgeConstants.TAG_UNSUPPORTED, + Bridge.getLog().error(LayoutLog.TAG_UNSUPPORTED, "Bitmap.decodeStream: " + "InputStream is unsupported (AssetManager.AssetInputStream)"); return null; diff --git a/tools/layoutlib/bridge/src/android/graphics/BitmapShader_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/BitmapShader_Delegate.java index 9d62415..03d65b2 100644 --- a/tools/layoutlib/bridge/src/android/graphics/BitmapShader_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/BitmapShader_Delegate.java @@ -16,8 +16,8 @@ package android.graphics; +import com.android.ide.common.rendering.api.LayoutLog; import com.android.layoutlib.bridge.Bridge; -import com.android.layoutlib.bridge.BridgeConstants; import com.android.layoutlib.bridge.impl.DelegateManager; import android.graphics.Shader.TileMode; @@ -113,7 +113,7 @@ public class BitmapShader_Delegate extends Shader_Delegate { try { canvasMatrix = xform.createInverse(); } catch (java.awt.geom.NoninvertibleTransformException e) { - Bridge.getLog().fidelityWarning(BridgeConstants.TAG_MATRIX, + Bridge.getLog().fidelityWarning(LayoutLog.TAG_MATRIX_INVERSE, "Unable to inverse matrix in BitmapShader", e); canvasMatrix = new java.awt.geom.AffineTransform(); } @@ -122,7 +122,7 @@ public class BitmapShader_Delegate extends Shader_Delegate { try { localMatrix = localMatrix.createInverse(); } catch (java.awt.geom.NoninvertibleTransformException e) { - Bridge.getLog().fidelityWarning(BridgeConstants.TAG_MATRIX, + Bridge.getLog().fidelityWarning(LayoutLog.TAG_MATRIX_INVERSE, "Unable to inverse matrix in BitmapShader", e); localMatrix = new java.awt.geom.AffineTransform(); } diff --git a/tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java index 6acae7c..18bf4b5 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java @@ -16,9 +16,9 @@ package android.graphics; +import com.android.ide.common.rendering.api.LayoutLog; import com.android.ide.common.rendering.api.ResourceDensity; import com.android.layoutlib.bridge.Bridge; -import com.android.layoutlib.bridge.BridgeConstants; import com.android.layoutlib.bridge.impl.DelegateManager; import android.graphics.Bitmap.Config; @@ -249,7 +249,7 @@ public final class Bitmap_Delegate { /*package*/ static boolean nativeCompress(int nativeBitmap, int format, int quality, OutputStream stream, byte[] tempStorage) { - Bridge.getLog().error(BridgeConstants.TAG_UNSUPPORTED, + Bridge.getLog().error(LayoutLog.TAG_UNSUPPORTED, "Bitmap.compress() is not supported"); return true; } @@ -385,7 +385,7 @@ public final class Bitmap_Delegate { /*package*/ static Bitmap nativeCreateFromParcel(Parcel p) { // 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(BridgeConstants.TAG_UNSUPPORTED, + Bridge.getLog().error(LayoutLog.TAG_UNSUPPORTED, "AIDL is not suppored, and therefore Bitmaps cannot be created from parcels."); return null; } @@ -394,7 +394,7 @@ public final class Bitmap_Delegate { int density, Parcel p) { // This is only called when sending a bitmap through aidl, so really this should not // be called. - Bridge.getLog().error(BridgeConstants.TAG_UNSUPPORTED, + Bridge.getLog().error(LayoutLog.TAG_UNSUPPORTED, "AIDL is not suppored, and therefore Bitmaps cannot be written to parcels."); return false; } @@ -410,7 +410,7 @@ public final class Bitmap_Delegate { Paint_Delegate paint = Paint_Delegate.getDelegate(nativePaint); if (paint != null && paint.getMaskFilter() != null) { - Bridge.getLog().fidelityWarning(BridgeConstants.TAG_MASKFILTER, + Bridge.getLog().fidelityWarning(LayoutLog.TAG_MASKFILTER, "MaskFilter not supported in Bitmap.extractAlpha", null); } diff --git a/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java index cafe52d..0d9efba 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java @@ -16,8 +16,8 @@ package android.graphics; +import com.android.ide.common.rendering.api.LayoutLog; import com.android.layoutlib.bridge.Bridge; -import com.android.layoutlib.bridge.BridgeConstants; import com.android.layoutlib.bridge.impl.DelegateManager; import com.android.layoutlib.bridge.impl.GcSnapshot; @@ -423,7 +423,7 @@ public final class Canvas_Delegate { if (matrixDelegate.hasPerspective()) { assert false; - Bridge.getLog().fidelityWarning(BridgeConstants.TAG_MATRIX, + Bridge.getLog().fidelityWarning(LayoutLog.TAG_MATRIX_AFFINE, "android.graphics.Canvas#setMatrix(android.graphics.Matrix) only " + "supports affine transformations.", null); } @@ -493,7 +493,7 @@ public final class Canvas_Delegate { } if (filterDelegate.isSupported() == false) { - Bridge.getLog().fidelityWarning(BridgeConstants.TAG_DRAWFILTER, + Bridge.getLog().fidelityWarning(LayoutLog.TAG_DRAWFILTER, filterDelegate.getSupportMessage(), null); } } diff --git a/tools/layoutlib/bridge/src/android/graphics/LinearGradient_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/LinearGradient_Delegate.java index 37d2c81..aab310a 100644 --- a/tools/layoutlib/bridge/src/android/graphics/LinearGradient_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/LinearGradient_Delegate.java @@ -16,8 +16,8 @@ package android.graphics; +import com.android.ide.common.rendering.api.LayoutLog; import com.android.layoutlib.bridge.Bridge; -import com.android.layoutlib.bridge.BridgeConstants; import com.android.layoutlib.bridge.impl.DelegateManager; import android.graphics.Shader.TileMode; @@ -136,7 +136,7 @@ public final class LinearGradient_Delegate extends Gradient_Delegate { try { canvasMatrix = xform.createInverse(); } catch (java.awt.geom.NoninvertibleTransformException e) { - Bridge.getLog().fidelityWarning(BridgeConstants.TAG_MATRIX, + Bridge.getLog().fidelityWarning(LayoutLog.TAG_MATRIX_INVERSE, "Unable to inverse matrix in LinearGradient", e); canvasMatrix = new java.awt.geom.AffineTransform(); } @@ -145,7 +145,7 @@ public final class LinearGradient_Delegate extends Gradient_Delegate { try { localMatrix = localMatrix.createInverse(); } catch (java.awt.geom.NoninvertibleTransformException e) { - Bridge.getLog().fidelityWarning(BridgeConstants.TAG_MATRIX, + Bridge.getLog().fidelityWarning(LayoutLog.TAG_MATRIX_INVERSE, "Unable to inverse matrix in LinearGradient", e); localMatrix = new java.awt.geom.AffineTransform(); } diff --git a/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java index 6d6c599..0c934fc 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java @@ -17,8 +17,8 @@ package android.graphics; +import com.android.ide.common.rendering.api.LayoutLog; import com.android.layoutlib.bridge.Bridge; -import com.android.layoutlib.bridge.BridgeConstants; import com.android.layoutlib.bridge.impl.DelegateManager; import android.graphics.Matrix.ScaleToFit; @@ -613,7 +613,7 @@ public final class Matrix_Delegate { /*package*/ static boolean native_setPolyToPoly(int native_object, float[] src, int srcIndex, float[] dst, int dstIndex, int pointCount) { // FIXME - Bridge.getLog().fidelityWarning(BridgeConstants.TAG_UNSUPPORTED, + Bridge.getLog().fidelityWarning(LayoutLog.TAG_UNSUPPORTED, "Matrix.setPolyToPoly is not supported.", null); return false; diff --git a/tools/layoutlib/bridge/src/android/graphics/NinePatch_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/NinePatch_Delegate.java index 385def3..049ac45 100644 --- a/tools/layoutlib/bridge/src/android/graphics/NinePatch_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/NinePatch_Delegate.java @@ -16,8 +16,8 @@ package android.graphics; +import com.android.ide.common.rendering.api.LayoutLog; import com.android.layoutlib.bridge.Bridge; -import com.android.layoutlib.bridge.BridgeConstants; import com.android.layoutlib.bridge.impl.DelegateManager; import com.android.layoutlib.bridge.impl.GcSnapshot; import com.android.ninepatch.NinePatchChunk; @@ -197,11 +197,11 @@ public final class NinePatch_Delegate { sChunkCache.put(array, new SoftReference<NinePatchChunk>(chunk)); } } catch (IOException e) { - Bridge.getLog().error(BridgeConstants.TAG_BROKEN, + Bridge.getLog().error(LayoutLog.TAG_BROKEN, "Failed to deserialize NinePatchChunk content.", e); return null; } catch (ClassNotFoundException e) { - Bridge.getLog().error(BridgeConstants.TAG_BROKEN, + Bridge.getLog().error(LayoutLog.TAG_BROKEN, "Failed to deserialize NinePatchChunk class.", e); return null; } finally { diff --git a/tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java index 7db3486..67afeca 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java @@ -16,8 +16,8 @@ package android.graphics; +import com.android.ide.common.rendering.api.LayoutLog; import com.android.layoutlib.bridge.Bridge; -import com.android.layoutlib.bridge.BridgeConstants; import com.android.layoutlib.bridge.impl.DelegateManager; import android.graphics.Paint.FontMetrics; @@ -180,7 +180,7 @@ public class Paint_Delegate { return stroke; } } else { - Bridge.getLog().fidelityWarning(BridgeConstants.TAG_PATHEFFECT, + Bridge.getLog().fidelityWarning(LayoutLog.TAG_PATHEFFECT, effectDelegate.getSupportMessage(), null); } @@ -376,7 +376,7 @@ public class Paint_Delegate { /*package*/ static void nSetShadowLayer(Paint thisPaint, float radius, float dx, float dy, int color) { // FIXME - Bridge.getLog().fidelityWarning(BridgeConstants.TAG_UNSUPPORTED, + Bridge.getLog().fidelityWarning(LayoutLog.TAG_UNSUPPORTED, "Paint.setShadowLayer is not supported.", null); } @@ -693,7 +693,7 @@ public class Paint_Delegate { // since none of those are supported, display a fidelity warning right away ColorFilter_Delegate filterDelegate = delegate.getColorFilter(); if (filterDelegate != null && filterDelegate.isSupported() == false) { - Bridge.getLog().fidelityWarning(BridgeConstants.TAG_COLORFILTER, + Bridge.getLog().fidelityWarning(LayoutLog.TAG_COLORFILTER, filterDelegate.getSupportMessage(), null); } @@ -732,7 +732,7 @@ public class Paint_Delegate { // since none of those are supported, display a fidelity warning right away MaskFilter_Delegate filterDelegate = delegate.getMaskFilter(); if (filterDelegate != null && filterDelegate.isSupported() == false) { - Bridge.getLog().fidelityWarning(BridgeConstants.TAG_MASKFILTER, + Bridge.getLog().fidelityWarning(LayoutLog.TAG_MASKFILTER, filterDelegate.getSupportMessage(), null); } @@ -763,7 +763,7 @@ public class Paint_Delegate { // since none of those are supported, display a fidelity warning right away Rasterizer_Delegate rasterizerDelegate = delegate.getRasterizer(); if (rasterizerDelegate != null && rasterizerDelegate.isSupported() == false) { - Bridge.getLog().fidelityWarning(BridgeConstants.TAG_RASTERIZER, + Bridge.getLog().fidelityWarning(LayoutLog.TAG_RASTERIZER, rasterizerDelegate.getSupportMessage(), null); } diff --git a/tools/layoutlib/bridge/src/android/graphics/Path_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Path_Delegate.java index ad9c9f9..62ea622 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Path_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Path_Delegate.java @@ -16,8 +16,8 @@ package android.graphics; +import com.android.ide.common.rendering.api.LayoutLog; import com.android.layoutlib.bridge.Bridge; -import com.android.layoutlib.bridge.BridgeConstants; import com.android.layoutlib.bridge.impl.DelegateManager; import android.graphics.Path.Direction; @@ -696,7 +696,7 @@ public final class Path_Delegate { public void transform(Matrix_Delegate matrix, Path_Delegate dst) { if (matrix.hasPerspective()) { assert false; - Bridge.getLog().fidelityWarning(BridgeConstants.TAG_MATRIX, + Bridge.getLog().fidelityWarning(LayoutLog.TAG_MATRIX_AFFINE, "android.graphics.Path#transform() only " + "supports affine transformations.", null); } diff --git a/tools/layoutlib/bridge/src/android/graphics/PorterDuffXfermode_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/PorterDuffXfermode_Delegate.java index b09806c..314dcff 100644 --- a/tools/layoutlib/bridge/src/android/graphics/PorterDuffXfermode_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/PorterDuffXfermode_Delegate.java @@ -16,8 +16,8 @@ package android.graphics; +import com.android.ide.common.rendering.api.LayoutLog; import com.android.layoutlib.bridge.Bridge; -import com.android.layoutlib.bridge.BridgeConstants; import com.android.layoutlib.bridge.impl.DelegateManager; import java.awt.AlphaComposite; @@ -73,7 +73,7 @@ public class PorterDuffXfermode_Delegate extends Xfermode_Delegate { } } - Bridge.getLog().error(BridgeConstants.TAG_BROKEN, + Bridge.getLog().error(LayoutLog.TAG_BROKEN, String.format("Unknown PorterDuff.Mode: %d", mode)); assert false; return PorterDuff.Mode.SRC_OVER; @@ -116,7 +116,7 @@ public class PorterDuffXfermode_Delegate extends Xfermode_Delegate { return AlphaComposite.getInstance(AlphaComposite.XOR, falpha); } - Bridge.getLog().fidelityWarning(BridgeConstants.TAG_BROKEN, + Bridge.getLog().fidelityWarning(LayoutLog.TAG_BROKEN, String.format("Unsupported PorterDuff Mode: %s", mode.name()), null); diff --git a/tools/layoutlib/bridge/src/android/graphics/RadialGradient_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/RadialGradient_Delegate.java index c86e808..2c26175 100644 --- a/tools/layoutlib/bridge/src/android/graphics/RadialGradient_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/RadialGradient_Delegate.java @@ -16,8 +16,8 @@ package android.graphics; +import com.android.ide.common.rendering.api.LayoutLog; import com.android.layoutlib.bridge.Bridge; -import com.android.layoutlib.bridge.BridgeConstants; import com.android.layoutlib.bridge.impl.DelegateManager; import android.graphics.Shader.TileMode; @@ -125,7 +125,7 @@ public class RadialGradient_Delegate extends Gradient_Delegate { try { canvasMatrix = xform.createInverse(); } catch (java.awt.geom.NoninvertibleTransformException e) { - Bridge.getLog().fidelityWarning(BridgeConstants.TAG_MATRIX, + Bridge.getLog().fidelityWarning(LayoutLog.TAG_MATRIX_INVERSE, "Unable to inverse matrix in RadialGradient", e); canvasMatrix = new java.awt.geom.AffineTransform(); } @@ -134,7 +134,7 @@ public class RadialGradient_Delegate extends Gradient_Delegate { try { localMatrix = localMatrix.createInverse(); } catch (java.awt.geom.NoninvertibleTransformException e) { - Bridge.getLog().fidelityWarning(BridgeConstants.TAG_MATRIX, + Bridge.getLog().fidelityWarning(LayoutLog.TAG_MATRIX_INVERSE, "Unable to inverse matrix in RadialGradient", e); localMatrix = new java.awt.geom.AffineTransform(); } diff --git a/tools/layoutlib/bridge/src/android/graphics/Region_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Region_Delegate.java index b587563..f86c56c 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Region_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Region_Delegate.java @@ -16,8 +16,8 @@ package android.graphics; +import com.android.ide.common.rendering.api.LayoutLog; import com.android.layoutlib.bridge.Bridge; -import com.android.layoutlib.bridge.BridgeConstants; import com.android.layoutlib.bridge.impl.DelegateManager; import android.os.Parcel; @@ -416,7 +416,7 @@ public class Region_Delegate { /*package*/ static int nativeCreateFromParcel(Parcel p) { // This is only called by Region.CREATOR (Parcelable.Creator<Region>), which is only // used during aidl call so really this should not be called. - Bridge.getLog().error(BridgeConstants.TAG_UNSUPPORTED, + Bridge.getLog().error(LayoutLog.TAG_UNSUPPORTED, "AIDL is not suppored, and therefore Regions cannot be created from parcels."); return 0; } @@ -425,7 +425,7 @@ public class Region_Delegate { Parcel p) { // This is only called when sending a region through aidl, so really this should not // be called. - Bridge.getLog().error(BridgeConstants.TAG_UNSUPPORTED, + Bridge.getLog().error(LayoutLog.TAG_UNSUPPORTED, "AIDL is not suppored, and therefore Regions cannot be written to parcels."); return false; } diff --git a/tools/layoutlib/bridge/src/android/graphics/SweepGradient_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/SweepGradient_Delegate.java index 9a84bdd..e812f7f 100644 --- a/tools/layoutlib/bridge/src/android/graphics/SweepGradient_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/SweepGradient_Delegate.java @@ -16,8 +16,8 @@ package android.graphics; +import com.android.ide.common.rendering.api.LayoutLog; import com.android.layoutlib.bridge.Bridge; -import com.android.layoutlib.bridge.BridgeConstants; import com.android.layoutlib.bridge.impl.DelegateManager; /** @@ -117,7 +117,7 @@ public class SweepGradient_Delegate extends Gradient_Delegate { try { canvasMatrix = xform.createInverse(); } catch (java.awt.geom.NoninvertibleTransformException e) { - Bridge.getLog().fidelityWarning(BridgeConstants.TAG_MATRIX, + Bridge.getLog().fidelityWarning(LayoutLog.TAG_MATRIX_INVERSE, "Unable to inverse matrix in SweepGradient", e); canvasMatrix = new java.awt.geom.AffineTransform(); } @@ -126,7 +126,7 @@ public class SweepGradient_Delegate extends Gradient_Delegate { try { localMatrix = localMatrix.createInverse(); } catch (java.awt.geom.NoninvertibleTransformException e) { - Bridge.getLog().fidelityWarning(BridgeConstants.TAG_MATRIX, + Bridge.getLog().fidelityWarning(LayoutLog.TAG_MATRIX_INVERSE, "Unable to inverse matrix in SweepGradient", e); localMatrix = new java.awt.geom.AffineTransform(); } diff --git a/tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java index c7d5490..44275d6 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java @@ -16,8 +16,8 @@ package android.graphics; +import com.android.ide.common.rendering.api.LayoutLog; import com.android.layoutlib.bridge.Bridge; -import com.android.layoutlib.bridge.BridgeConstants; import com.android.layoutlib.bridge.impl.DelegateManager; import com.android.layoutlib.bridge.impl.FontLoader; @@ -126,13 +126,13 @@ public final class Typeface_Delegate { } /*package*/ static synchronized int nativeCreateFromAsset(AssetManager mgr, String path) { - Bridge.getLog().fidelityWarning(BridgeConstants.TAG_UNSUPPORTED, + Bridge.getLog().fidelityWarning(LayoutLog.TAG_UNSUPPORTED, "Typeface.createFromAsset() is not supported.", null); return 0; } /*package*/ static synchronized int nativeCreateFromFile(String path) { - Bridge.getLog().fidelityWarning(BridgeConstants.TAG_UNSUPPORTED, + Bridge.getLog().fidelityWarning(LayoutLog.TAG_UNSUPPORTED, "Typeface.createFromFile() is not supported.", null); return 0; } |