Merge "Make Layoutlib compile on Java 6." (c445ed70) · Commits · e / os / android_frameworks_base

tools/layoutlib/bridge/.settings/README.txt

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		Copy this in eclipse project as a .settings folder at the root.
		This ensure proper compilation compliance and warning/error levels.
		No newline at end of file

tools/layoutlib/bridge/.settings/org.eclipse.jdt.core.prefs

0 → 100644

+93 −0

Original line number	Diff line number	Diff line
		eclipse.preferences.version=1
		org.eclipse.jdt.core.compiler.annotation.nonnull=com.android.annotations.NonNull
		org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=com.android.annotations.NonNullByDefault
		org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled
		org.eclipse.jdt.core.compiler.annotation.nullable=com.android.annotations.Nullable
		org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
		org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
		org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
		org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
		org.eclipse.jdt.core.compiler.compliance=1.6
		org.eclipse.jdt.core.compiler.debug.lineNumber=generate
		org.eclipse.jdt.core.compiler.debug.localVariable=generate
		org.eclipse.jdt.core.compiler.debug.sourceFile=generate
		org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
		org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
		org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
		org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
		org.eclipse.jdt.core.compiler.problem.deadCode=warning
		org.eclipse.jdt.core.compiler.problem.deprecation=warning
		org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
		org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
		org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
		org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
		org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
		org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
		org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
		org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
		org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
		org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
		org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
		org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
		org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
		org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
		org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
		org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
		org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
		org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
		org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
		org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
		org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
		org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
		org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
		org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
		org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
		org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
		org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
		org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
		org.eclipse.jdt.core.compiler.problem.nullReference=error
		org.eclipse.jdt.core.compiler.problem.nullSpecInsufficientInfo=warning
		org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
		org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
		org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
		org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
		org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
		org.eclipse.jdt.core.compiler.problem.potentialNullSpecViolation=error
		org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
		org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
		org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
		org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
		org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
		org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
		org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
		org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
		org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
		org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
		org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
		org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
		org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
		org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
		org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
		org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
		org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
		org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
		org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
		org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
		org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
		org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
		org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
		org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
		org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
		org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
		org.eclipse.jdt.core.compiler.problem.unusedImport=warning
		org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
		org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
		org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
		org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
		org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
		org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
		org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
		org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
		org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
		org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
		org.eclipse.jdt.core.compiler.source=1.6

tools/layoutlib/bridge/src/android/animation/AnimationThread.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -23,11 +23,10 @@ import com.android.ide.common.rendering.api.Result.Status;
		import com.android.layoutlib.bridge.Bridge;
		import com.android.layoutlib.bridge.impl.RenderSessionImpl;

		import android.animation.ValueAnimator;
		import android.os.Handler;
		import android.os.Handler_Delegate;
		import android.os.Message;
		import android.os.Handler_Delegate.IHandlerCallback;
		import android.os.Message;

		import java.util.PriorityQueue;
		import java.util.Queue;
		@@ -57,6 +56,7 @@ public abstract class AnimationThread extends Thread {
		mUptimeMillis = uptimeMillis;
		}

		@Override
		public int compareTo(MessageBundle bundle) {
		if (mUptimeMillis < bundle.mUptimeMillis) {
		return -1;
		@@ -85,6 +85,7 @@ public abstract class AnimationThread extends Thread {
		Bridge.prepareThread();
		try {
		Handler_Delegate.setCallback(new IHandlerCallback() {
		@Override
		public void sendMessageAtTime(Handler handler, Message msg, long uptimeMillis) {
		if (msg.what == ValueAnimator.ANIMATION_START /*\|\|
		FIXME: The ANIMATION_FRAME message no longer exists. Instead,

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -105,6 +105,7 @@ public class BitmapShader_Delegate extends Shader_Delegate {
		mTileModeY = tileModeY;
		}

		@Override
		public java.awt.PaintContext createContext(
		java.awt.image.ColorModel colorModel,
		java.awt.Rectangle deviceBounds,
		@@ -148,13 +149,16 @@ public class BitmapShader_Delegate extends Shader_Delegate {
		mColorModel = colorModel;
		}

		@Override
		public void dispose() {
		}

		@Override
		public java.awt.image.ColorModel getColorModel() {
		return mColorModel;
		}

		@Override
		public java.awt.image.Raster getRaster(int x, int y, int w, int h) {
		java.awt.image.BufferedImage image = new java.awt.image.BufferedImage(w, h,
		java.awt.image.BufferedImage.TYPE_INT_ARGB);
		@@ -240,6 +244,7 @@ public class BitmapShader_Delegate extends Shader_Delegate {
		}


		@Override
		public int getTransparency() {
		return java.awt.Paint.TRANSLUCENT;
		}

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -291,6 +291,7 @@ public final class Canvas_Delegate {
		Paint paint) {
		draw(thisCanvas.mNativeCanvas, paint.mNativePaint, false /compositeOnly/,
		false /forceSrcMode/, new GcSnapshot.Drawable() {
		@Override
		public void draw(Graphics2D graphics, Paint_Delegate paintDelegate) {
		for (int i = 0 ; i < count ; i += 4) {
		graphics.drawLine((int)pts[i + offset], (int)pts[i + offset + 1],
		@@ -619,6 +620,7 @@ public final class Canvas_Delegate {
		final int h = canvasDelegate.mBitmap.getImage().getHeight();
		draw(nativeCanvas, new GcSnapshot.Drawable() {

		@Override
		public void draw(Graphics2D graphics, Paint_Delegate paint) {
		// reset its transform just in case
		graphics.setTransform(new AffineTransform());
		@@ -651,6 +653,7 @@ public final class Canvas_Delegate {

		draw(nativeCanvas, paint, false /compositeOnly/, false /forceSrcMode/,
		new GcSnapshot.Drawable() {
		@Override
		public void draw(Graphics2D graphics, Paint_Delegate paintDelegate) {
		graphics.drawLine((int)startX, (int)startY, (int)stopX, (int)stopY);
		}
		@@ -669,6 +672,7 @@ public final class Canvas_Delegate {

		draw(nativeCanvas, paint, false /compositeOnly/, false /forceSrcMode/,
		new GcSnapshot.Drawable() {
		@Override
		public void draw(Graphics2D graphics, Paint_Delegate paintDelegate) {
		int style = paintDelegate.getStyle();

		@@ -693,6 +697,7 @@ public final class Canvas_Delegate {
		if (oval.right > oval.left && oval.bottom > oval.top) {
		draw(nativeCanvas, paint, false /compositeOnly/, false /forceSrcMode/,
		new GcSnapshot.Drawable() {
		@Override
		public void draw(Graphics2D graphics, Paint_Delegate paintDelegate) {
		int style = paintDelegate.getStyle();

		@@ -728,6 +733,7 @@ public final class Canvas_Delegate {
		if (oval.right > oval.left && oval.bottom > oval.top) {
		draw(nativeCanvas, paint, false /compositeOnly/, false /forceSrcMode/,
		new GcSnapshot.Drawable() {
		@Override
		public void draw(Graphics2D graphics, Paint_Delegate paintDelegate) {
		int style = paintDelegate.getStyle();

		@@ -757,6 +763,7 @@ public final class Canvas_Delegate {

		draw(nativeCanvas, paint, false /compositeOnly/, false /forceSrcMode/,
		new GcSnapshot.Drawable() {
		@Override
		public void draw(Graphics2D graphics, Paint_Delegate paintDelegate) {
		int style = paintDelegate.getStyle();

		@@ -789,6 +796,7 @@ public final class Canvas_Delegate {

		draw(nativeCanvas, paint, false /compositeOnly/, false /forceSrcMode/,
		new GcSnapshot.Drawable() {
		@Override
		public void draw(Graphics2D graphics, Paint_Delegate paintDelegate) {
		Shape shape = pathDelegate.getJavaShape();
		int style = paintDelegate.getStyle();
		@@ -892,6 +900,7 @@ public final class Canvas_Delegate {

		draw(nativeCanvas, nativePaintOrZero, true /compositeOnly/, false /forceSrcMode/,
		new GcSnapshot.Drawable() {
		@Override
		public void draw(Graphics2D graphics, Paint_Delegate paint) {
		if (paint != null && paint.isFilterBitmap()) {
		graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
		@@ -931,6 +940,7 @@ public final class Canvas_Delegate {
		final AffineTransform mtx = matrixDelegate.getAffineTransform();

		canvasDelegate.getSnapshot().draw(new GcSnapshot.Drawable() {
		@Override
		public void draw(Graphics2D graphics, Paint_Delegate paint) {
		if (paint != null && paint.isFilterBitmap()) {
		graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
		@@ -970,6 +980,7 @@ public final class Canvas_Delegate {
		final float startX, final float startY, int flags, int paint) {
		draw(nativeCanvas, paint, false /compositeOnly/, false /forceSrcMode/,
		new GcSnapshot.Drawable() {
		@Override
		public void draw(Graphics2D graphics, Paint_Delegate paintDelegate) {
		// WARNING: the logic in this method is similar to Paint_Delegate.measureText.
		// Any change to this method should be reflected in Paint.measureText
		@@ -1279,6 +1290,7 @@ public final class Canvas_Delegate {

		draw(nativeCanvas, nativePaintOrZero, true /compositeOnly/, sBoolOut[0],
		new GcSnapshot.Drawable() {
		@Override
		public void draw(Graphics2D graphics, Paint_Delegate paint) {
		if (paint != null && paint.isFilterBitmap()) {
		graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION,