commit abce70175bca563c2bf6e5de91c934330fc033dd
author Xavier Ducrohet <xav@android.com> Tue Jan 11 10:54:12 2011 -0800
committer Xavier Ducrohet <xav@android.com> Tue Jan 11 10:54:12 2011 -0800
tree a3dae58f5f00520acd5e0f6cdd87242f3af4af5d
parent 551346323dace2bdb2509a7f5c9a0a200794b29c

LayoutLib: only support animator-type animations.

Change-Id: Ia3609fc5d11555190bc323d61a3577144a4692fd

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

diff --git a/bridge/src/com/android/layoutlib/bridge/BridgeConstants.java b/bridge/src/com/android/layoutlib/bridge/BridgeConstants.java
index 596cbfc..194687e 100644
--- a/bridge/src/com/android/layoutlib/bridge/BridgeConstants.java
+++ b/bridge/src/com/android/layoutlib/bridge/BridgeConstants.java
@@ -48,7 +48,6 @@
 
     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";

bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java

diff --git a/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java b/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
index d2fef5e..1c75f7b 100644
--- a/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
+++ b/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
@@ -505,18 +505,18 @@
         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);
             }
         }