diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-01-11 10:54:12 -0800 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2011-01-11 10:54:12 -0800 |
| commit | b3830b8978aa05746912210932e26ebf1836aab5 (patch) | |
| tree | c891039b07c40d8a35a52cc7072d9f5fbb6e2221 /tools | |
| parent | eb87b3bb53a8a9e9a246b4b70ea40172e2229c85 (diff) | |
| download | frameworks_base-b3830b8978aa05746912210932e26ebf1836aab5.zip frameworks_base-b3830b8978aa05746912210932e26ebf1836aab5.tar.gz frameworks_base-b3830b8978aa05746912210932e26ebf1836aab5.tar.bz2 | |
LayoutLib: only support animator-type animations.
Change-Id: Ia3609fc5d11555190bc323d61a3577144a4692fd
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeConstants.java | 1 | ||||
| -rw-r--r-- | tools/layoutlib/bridge/src/com/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 596cbfc..194687e 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 d2fef5e..1c75f7b 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); } } |