drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't skip loading object animator." into lmp-dev

Browse Source
This commit is contained in:
Deepanshu Gupta
2014-11-11 17:11:22 +00:00
committed by Android (Google) Code Review
parent 75c306ddc7 2c5cddbd07
commit a44fdb9e21
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/layoutlib/bridge/src/android/animation/AnimatorInflater_Delegate.java
View File

@ -54,6 +54,6 @@ public class AnimatorInflater_Delegate {
/*package*/ static ValueAnimator loadAnimator(Resources res, Theme theme, /*package*/ static ValueAnimator loadAnimator(Resources res, Theme theme,
AttributeSet attrs, ValueAnimator anim, float pathErrorScale) AttributeSet attrs, ValueAnimator anim, float pathErrorScale)
throws NotFoundException { throws NotFoundException {
return anim; return AnimatorInflater.loadAnimator_Original(res, theme, attrs, anim, pathErrorScale);
} }
} }

1
tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateClassAdapter.java
View File

@ -112,6 +112,7 @@ public class DelegateClassAdapter extends ClassVisitor {
// The implementation of this 'delegate' method is done in layoutlib_bridge. // The implementation of this 'delegate' method is done in layoutlib_bridge.
int accessDelegate = access; int accessDelegate = access;
access = access & ~Opcodes.ACC_PRIVATE; // If private, make it package protected.
MethodVisitor mwOriginal = super.visitMethod(access, name + ORIGINAL_SUFFIX, MethodVisitor mwOriginal = super.visitMethod(access, name + ORIGINAL_SUFFIX,
desc, signature, exceptions); desc, signature, exceptions);