From b3830b8978aa05746912210932e26ebf1836aab5 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Tue, 11 Jan 2011 10:54:12 -0800 Subject: [PATCH] LayoutLib: only support animator-type animations. Change-Id: Ia3609fc5d11555190bc323d61a3577144a4692fd --- .../src/com/android/layoutlib/bridge/BridgeConstants.java | 1 - .../android/layoutlib/bridge/impl/RenderSessionImpl.java | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeConstants.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeConstants.java index 596cbfca2cb3a..194687ebb48d8 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeConstants.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeConstants.java @@ -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"; diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java index d2fef5e04bd48..1c75f7b2a14bb 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java @@ -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); } }