Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "LayoutLib: only support animator-type animations." into honeycomb

Browse Source
This commit is contained in:
Xavier Ducrohet
2011-01-11 13:22:19 -08:00
committed by Android (Google) Code Review
parent d865011473 b3830b8978
commit b289359170
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeConstants.java
View File

@@ -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";

8
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
View File

@@ -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);
}
}