From 2c5cddbd07bb46b22617a362f3af23be7720f9d5 Mon Sep 17 00:00:00 2001 From: Deepanshu Gupta Date: Tue, 11 Nov 2014 15:21:19 +0000 Subject: Don't skip loading object animator. This is used by Buttons as part of StateListAnimator. Change-Id: Id370869e71898d46e11bbd17ad31169c9f9f5274 --- .../bridge/src/android/animation/AnimatorInflater_Delegate.java | 2 +- .../src/com/android/tools/layoutlib/create/DelegateClassAdapter.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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); } } diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateClassAdapter.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateClassAdapter.java index 3d89c68..ae4a57d 100644 --- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateClassAdapter.java +++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateClassAdapter.java @@ -112,6 +112,7 @@ public class DelegateClassAdapter extends ClassVisitor { // The implementation of this 'delegate' method is done in layoutlib_bridge. int accessDelegate = access; + access = access & ~Opcodes.ACC_PRIVATE; // If private, make it package protected. MethodVisitor mwOriginal = super.visitMethod(access, name + ORIGINAL_SUFFIX, desc, signature, exceptions); -- cgit v1.1