LayoutLib: Update layoutlib with revised API. (19a02103) · Commits · e / os / android_frameworks_base

tools/layoutlib/bridge/src/android/app/Fragment_Delegate.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,7 @@

	package android.app;		package android.app;

	import com.android.layoutlib.api.IProjectCallback;		import com.android.ide.common.rendering.api.IProjectCallback;

	import android.content.Context;		import android.content.Context;
	import android.os.Bundle;		import android.os.Bundle;

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,7 @@

	package android.graphics;		package android.graphics;

	import com.android.layoutlib.api.ResourceDensity;		import com.android.ide.common.rendering.api.ResourceDensity;
	import com.android.layoutlib.bridge.Bridge;		import com.android.layoutlib.bridge.Bridge;

	import android.content.res.AssetManager;		import android.content.res.AssetManager;

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,7 @@

	package android.graphics;		package android.graphics;

	import com.android.layoutlib.api.ResourceDensity;		import com.android.ide.common.rendering.api.ResourceDensity;
	import com.android.layoutlib.bridge.impl.DelegateManager;		import com.android.layoutlib.bridge.impl.DelegateManager;

	import android.graphics.Bitmap.Config;		import android.graphics.Bitmap.Config;

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java

+21 −18

Original line number	Original line	Diff line number	Diff line
	@@ -16,15 +16,17 @@

	package com.android.layoutlib.bridge;		package com.android.layoutlib.bridge;

	import com.android.layoutlib.api.Capability;		import static com.android.ide.common.rendering.api.Result.Status.ERROR_UNKNOWN;
	import com.android.layoutlib.api.LayoutBridge;		import static com.android.ide.common.rendering.api.Result.Status.SUCCESS;
	import com.android.layoutlib.api.LayoutLog;
	import com.android.layoutlib.api.SceneParams;		import com.android.ide.common.rendering.api.Capability;
	import com.android.layoutlib.api.SceneResult;		import com.android.ide.common.rendering.api.LayoutLog;
	import com.android.layoutlib.api.SceneResult.SceneStatus;		import com.android.ide.common.rendering.api.Params;
			import com.android.ide.common.rendering.api.RenderSession;
			import com.android.ide.common.rendering.api.Result;
	import com.android.layoutlib.bridge.android.BridgeAssetManager;		import com.android.layoutlib.bridge.android.BridgeAssetManager;
	import com.android.layoutlib.bridge.impl.FontLoader;		import com.android.layoutlib.bridge.impl.FontLoader;
	import com.android.layoutlib.bridge.impl.LayoutSceneImpl;		import com.android.layoutlib.bridge.impl.RenderSessionImpl;
	import com.android.ninepatch.NinePatchChunk;		import com.android.ninepatch.NinePatchChunk;
	import com.android.tools.layoutlib.create.MethodAdapter;		import com.android.tools.layoutlib.create.MethodAdapter;
	import com.android.tools.layoutlib.create.OverrideMethod;		import com.android.tools.layoutlib.create.OverrideMethod;
	@@ -33,6 +35,7 @@ import android.graphics.Bitmap;
	import android.graphics.Typeface_Delegate;		import android.graphics.Typeface_Delegate;
	import android.os.Looper;		import android.os.Looper;

			import java.io.File;
	import java.lang.ref.SoftReference;		import java.lang.ref.SoftReference;
	import java.lang.reflect.Field;		import java.lang.reflect.Field;
	import java.lang.reflect.Modifier;		import java.lang.reflect.Modifier;
	@@ -47,7 +50,7 @@ import java.util.concurrent.locks.ReentrantLock;
	* <p/>To use this bridge, simply instantiate an object of type {@link Bridge} and call		* <p/>To use this bridge, simply instantiate an object of type {@link Bridge} and call
	* {@link #createScene(SceneParams)}		* {@link #createScene(SceneParams)}
	*/		*/
	public final class Bridge extends LayoutBridge {		public final class Bridge extends com.android.ide.common.rendering.api.Bridge {

	public static class StaticMethodNotImplementedException extends RuntimeException {		public static class StaticMethodNotImplementedException extends RuntimeException {
	private static final long serialVersionUID = 1L;		private static final long serialVersionUID = 1L;
	@@ -169,7 +172,7 @@ public final class Bridge extends LayoutBridge {

	@Override		@Override
	public int getApiLevel() {		public int getApiLevel() {
	return LayoutBridge.API_CURRENT;		return com.android.ide.common.rendering.api.Bridge.API_CURRENT;
	}		}

	@Override		@Override
	@@ -179,10 +182,10 @@ public final class Bridge extends LayoutBridge {

	/*		/*
	* (non-Javadoc)		* (non-Javadoc)
	* @see com.android.layoutlib.api.ILayoutLibBridge#init(java.lang.String, java.util.Map)		* @see com.android.layoutlib.api.ILayoutLibBridge#init(java.io.File, java.util.Map)
	*/		*/
	@Override		@Override
	public boolean init(String fontOsLocation, Map<String, Map<String, Integer>> enumValueMap) {		public boolean init(File fontLocation, Map<String, Map<String, Integer>> enumValueMap) {
	sEnumValueMap = enumValueMap;		sEnumValueMap = enumValueMap;

	// don't use EnumSet.allOf(), because the bridge doesn't come with its specific version		// don't use EnumSet.allOf(), because the bridge doesn't come with its specific version
	@@ -229,7 +232,7 @@ public final class Bridge extends LayoutBridge {
	}		}

	// load the fonts.		// load the fonts.
	FontLoader fontLoader = FontLoader.create(fontOsLocation);		FontLoader fontLoader = FontLoader.create(fontLocation.getAbsolutePath());
	if (fontLoader != null) {		if (fontLoader != null) {
	Typeface_Delegate.init(fontLoader);		Typeface_Delegate.init(fontLoader);
	} else {		} else {
	@@ -299,10 +302,10 @@ public final class Bridge extends LayoutBridge {
	* @since 5		* @since 5
	*/		*/
	@Override		@Override
	public BridgeLayoutScene createScene(SceneParams params) {		public RenderSession createSession(Params params) {
	try {		try {
	SceneResult lastResult = SceneStatus.SUCCESS.createResult();		Result lastResult = SUCCESS.createResult();
	LayoutSceneImpl scene = new LayoutSceneImpl(params);		RenderSessionImpl scene = new RenderSessionImpl(params);
	try {		try {
	prepareThread();		prepareThread();
	lastResult = scene.init(params.getTimeout());		lastResult = scene.init(params.getTimeout());
	@@ -317,15 +320,15 @@ public final class Bridge extends LayoutBridge {
	cleanupThread();		cleanupThread();
	}		}

	return new BridgeLayoutScene(scene, lastResult);		return new BridgeRenderSession(scene, lastResult);
	} catch (Throwable t) {		} catch (Throwable t) {
	// get the real cause of the exception.		// get the real cause of the exception.
	Throwable t2 = t;		Throwable t2 = t;
	while (t2.getCause() != null) {		while (t2.getCause() != null) {
	t2 = t.getCause();		t2 = t.getCause();
	}		}
	return new BridgeLayoutScene(null,		return new BridgeRenderSession(null,
	SceneStatus.ERROR_UNKNOWN.createResult(t2.getMessage(), t2));		ERROR_UNKNOWN.createResult(t2.getMessage(), t2));
	}		}
	}		}

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeLayoutScene.java→tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeRenderSession.java

+40 −39

Original line number	Original line	Diff line number	Diff line
	@@ -16,12 +16,13 @@

	package com.android.layoutlib.bridge;		package com.android.layoutlib.bridge;

	import com.android.layoutlib.api.IXmlPullParser;		import com.android.ide.common.rendering.api.IAnimationListener;
	import com.android.layoutlib.api.LayoutScene;		import com.android.ide.common.rendering.api.ILayoutPullParser;
	import com.android.layoutlib.api.SceneParams;		import com.android.ide.common.rendering.api.Params;
	import com.android.layoutlib.api.SceneResult;		import com.android.ide.common.rendering.api.RenderSession;
	import com.android.layoutlib.api.ViewInfo;		import com.android.ide.common.rendering.api.Result;
	import com.android.layoutlib.bridge.impl.LayoutSceneImpl;		import com.android.ide.common.rendering.api.ViewInfo;
			import com.android.layoutlib.bridge.impl.RenderSessionImpl;

	import android.view.View;		import android.view.View;
	import android.view.ViewGroup;		import android.view.ViewGroup;
	@@ -30,47 +31,47 @@ import java.awt.image.BufferedImage;
	import java.util.Map;		import java.util.Map;

	/**		/**
	* An implementation of {@link LayoutScene}.		* An implementation of {@link RenderSession}.
	*		*
	* This is a pretty basic class that does almost nothing. All of the work is done in		* This is a pretty basic class that does almost nothing. All of the work is done in
	* {@link LayoutSceneImpl}.		* {@link RenderSessionImpl}.
	*		*
	*/		*/
	public class BridgeLayoutScene extends LayoutScene {		public class BridgeRenderSession extends RenderSession {

	private final LayoutSceneImpl mScene;		private final RenderSessionImpl mSession;
	private SceneResult mLastResult;		private Result mLastResult;

	@Override		@Override
	public SceneResult getResult() {		public Result getResult() {
	return mLastResult;		return mLastResult;
	}		}

	@Override		@Override
	public BufferedImage getImage() {		public BufferedImage getImage() {
	return mScene.getImage();		return mSession.getImage();
	}		}

	@Override		@Override
	public ViewInfo getRootView() {		public ViewInfo getRootView() {
	return mScene.getViewInfo();		return mSession.getViewInfo();
	}		}

	@Override		@Override
	public Map<String, String> getDefaultViewPropertyValues(Object viewObject) {		public Map<String, String> getDefaultProperties(Object viewObject) {
	return mScene.getDefaultViewPropertyValues(viewObject);		return mSession.getDefaultProperties(viewObject);
	}		}

	@Override		@Override
	public SceneResult render(long timeout) {		public Result render(long timeout) {
	try {		try {
	Bridge.prepareThread();		Bridge.prepareThread();
	mLastResult = mScene.acquire(timeout);		mLastResult = mSession.acquire(timeout);
	if (mLastResult.isSuccess()) {		if (mLastResult.isSuccess()) {
	mLastResult = mScene.render();		mLastResult = mSession.render();
	}		}
	} finally {		} finally {
	mScene.release();		mSession.release();
	Bridge.cleanupThread();		Bridge.cleanupThread();
	}		}

	@@ -78,17 +79,17 @@ public class BridgeLayoutScene extends LayoutScene {
	}		}

	@Override		@Override
	public SceneResult animate(Object targetObject, String animationName,		public Result animate(Object targetObject, String animationName,
	boolean isFrameworkAnimation, IAnimationListener listener) {		boolean isFrameworkAnimation, IAnimationListener listener) {
	try {		try {
	Bridge.prepareThread();		Bridge.prepareThread();
	mLastResult = mScene.acquire(SceneParams.DEFAULT_TIMEOUT);		mLastResult = mSession.acquire(Params.DEFAULT_TIMEOUT);
	if (mLastResult.isSuccess()) {		if (mLastResult.isSuccess()) {
	mLastResult = mScene.animate(targetObject, animationName, isFrameworkAnimation,		mLastResult = mSession.animate(targetObject, animationName, isFrameworkAnimation,
	listener);		listener);
	}		}
	} finally {		} finally {
	mScene.release();		mSession.release();
	Bridge.cleanupThread();		Bridge.cleanupThread();
	}		}

	@@ -96,7 +97,7 @@ public class BridgeLayoutScene extends LayoutScene {
	}		}

	@Override		@Override
	public SceneResult insertChild(Object parentView, IXmlPullParser childXml, int index,		public Result insertChild(Object parentView, ILayoutPullParser childXml, int index,
	IAnimationListener listener) {		IAnimationListener listener) {
	if (parentView instanceof ViewGroup == false) {		if (parentView instanceof ViewGroup == false) {
	throw new IllegalArgumentException("parentView is not a ViewGroup");		throw new IllegalArgumentException("parentView is not a ViewGroup");
	@@ -104,12 +105,12 @@ public class BridgeLayoutScene extends LayoutScene {

	try {		try {
	Bridge.prepareThread();		Bridge.prepareThread();
	mLastResult = mScene.acquire(SceneParams.DEFAULT_TIMEOUT);		mLastResult = mSession.acquire(Params.DEFAULT_TIMEOUT);
	if (mLastResult.isSuccess()) {		if (mLastResult.isSuccess()) {
	mLastResult = mScene.insertChild((ViewGroup) parentView, childXml, index, listener);		mLastResult = mSession.insertChild((ViewGroup) parentView, childXml, index, listener);
	}		}
	} finally {		} finally {
	mScene.release();		mSession.release();
	Bridge.cleanupThread();		Bridge.cleanupThread();
	}		}

	@@ -118,7 +119,7 @@ public class BridgeLayoutScene extends LayoutScene {


	@Override		@Override
	public SceneResult moveChild(Object parentView, Object childView, int index,		public Result moveChild(Object parentView, Object childView, int index,
	Map<String, String> layoutParams, IAnimationListener listener) {		Map<String, String> layoutParams, IAnimationListener listener) {
	if (parentView instanceof ViewGroup == false) {		if (parentView instanceof ViewGroup == false) {
	throw new IllegalArgumentException("parentView is not a ViewGroup");		throw new IllegalArgumentException("parentView is not a ViewGroup");
	@@ -129,13 +130,13 @@ public class BridgeLayoutScene extends LayoutScene {

	try {		try {
	Bridge.prepareThread();		Bridge.prepareThread();
	mLastResult = mScene.acquire(SceneParams.DEFAULT_TIMEOUT);		mLastResult = mSession.acquire(Params.DEFAULT_TIMEOUT);
	if (mLastResult.isSuccess()) {		if (mLastResult.isSuccess()) {
	mLastResult = mScene.moveChild((ViewGroup) parentView, (View) childView, index,		mLastResult = mSession.moveChild((ViewGroup) parentView, (View) childView, index,
	layoutParams, listener);		layoutParams, listener);
	}		}
	} finally {		} finally {
	mScene.release();		mSession.release();
	Bridge.cleanupThread();		Bridge.cleanupThread();
	}		}

	@@ -143,19 +144,19 @@ public class BridgeLayoutScene extends LayoutScene {
	}		}

	@Override		@Override
	public SceneResult removeChild(Object childView, IAnimationListener listener) {		public Result removeChild(Object childView, IAnimationListener listener) {
	if (childView instanceof View == false) {		if (childView instanceof View == false) {
	throw new IllegalArgumentException("childView is not a View");		throw new IllegalArgumentException("childView is not a View");
	}		}

	try {		try {
	Bridge.prepareThread();		Bridge.prepareThread();
	mLastResult = mScene.acquire(SceneParams.DEFAULT_TIMEOUT);		mLastResult = mSession.acquire(Params.DEFAULT_TIMEOUT);
	if (mLastResult.isSuccess()) {		if (mLastResult.isSuccess()) {
	mLastResult = mScene.removeChild((View) childView, listener);		mLastResult = mSession.removeChild((View) childView, listener);
	}		}
	} finally {		} finally {
	mScene.release();		mSession.release();
	Bridge.cleanupThread();		Bridge.cleanupThread();
	}		}

	@@ -166,9 +167,9 @@ public class BridgeLayoutScene extends LayoutScene {
	public void dispose() {		public void dispose() {
	}		}

	/package/ BridgeLayoutScene(LayoutSceneImpl scene, SceneResult lastResult) {		/package/ BridgeRenderSession(RenderSessionImpl scene, Result lastResult) {
	mScene = scene;		mSession = scene;
	mScene.setScene(this);		mSession.setScene(this);
	mLastResult = lastResult;		mLastResult = lastResult;
	}		}
	}		}