summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib/bridge/src/android/animation
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-11-11 15:21:19 +0000
committerDeepanshu Gupta <deepanshu@google.com>2014-11-11 15:21:19 +0000
commit2c5cddbd07bb46b22617a362f3af23be7720f9d5 (patch)
treea9e8e1984e90cce008f10f87f386af34a470954e /tools/layoutlib/bridge/src/android/animation
parent8657baa06d2efe845cafef571bd9dce627cf5045 (diff)
downloadframeworks_base-2c5cddbd07bb46b22617a362f3af23be7720f9d5.zip
frameworks_base-2c5cddbd07bb46b22617a362f3af23be7720f9d5.tar.gz
frameworks_base-2c5cddbd07bb46b22617a362f3af23be7720f9d5.tar.bz2
Don't skip loading object animator.
This is used by Buttons as part of StateListAnimator. Change-Id: Id370869e71898d46e11bbd17ad31169c9f9f5274
Diffstat (limited to 'tools/layoutlib/bridge/src/android/animation')
-rw-r--r--tools/layoutlib/bridge/src/android/animation/AnimatorInflater_Delegate.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/layoutlib/bridge/src/android/animation/AnimatorInflater_Delegate.java b/tools/layoutlib/bridge/src/android/animation/AnimatorInflater_Delegate.java
index d8a6ffc..4475fa4 100644
--- a/tools/layoutlib/bridge/src/android/animation/AnimatorInflater_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/animation/AnimatorInflater_Delegate.java
@@ -54,6 +54,6 @@ public class AnimatorInflater_Delegate {
/*package*/ static ValueAnimator loadAnimator(Resources res, Theme theme,
AttributeSet attrs, ValueAnimator anim, float pathErrorScale)
throws NotFoundException {
- return anim;
+ return AnimatorInflater.loadAnimator_Original(res, theme, attrs, anim, pathErrorScale);
}
}