Merge "LayoutLib: only support animator-type animations." into honeycomb (b2893591) · Commits · e / os / android_frameworks_base

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,6 @@ public class BridgeConstants {

		public final static String PREFIX_ANDROID = "android:";

		public final static String RES_ANIM = "anim";
		public final static String RES_ANIMATOR = "animator";
		public final static String RES_STYLE = "style";
		public final static String RES_ATTR = "attr";

+4 −4

Original line number	Diff line number	Diff line
		@@ -505,18 +505,18 @@ public class RenderSessionImpl {
		ResourceValue animationResource = null;
		int animationId = 0;
		if (isFrameworkAnimation) {
		animationResource = mContext.getFrameworkResource(BridgeConstants.RES_ANIM,
		animationResource = mContext.getFrameworkResource(BridgeConstants.RES_ANIMATOR,
		animationName);
		if (animationResource != null) {
		animationId = Bridge.getResourceValue(BridgeConstants.RES_ANIM,
		animationId = Bridge.getResourceValue(BridgeConstants.RES_ANIMATOR,
		animationName);
		}
		} else {
		animationResource = mContext.getProjectResource(BridgeConstants.RES_ANIM,
		animationResource = mContext.getProjectResource(BridgeConstants.RES_ANIMATOR,
		animationName);
		if (animationResource != null) {
		animationId = mContext.getProjectCallback().getResourceValue(
		BridgeConstants.RES_ANIM, animationName);
		BridgeConstants.RES_ANIMATOR, animationName);
		}
		}