Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83e5329b authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android Git Automerger
Browse files

am 028372b0: am 7ed525bf: am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading... 

am 028372b0: am 7ed525bf: am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev automerge: 8f6e7a86

* commit '028372b0':
  Don't skip loading object animator.
parents f4a53c6d 028372b0

tools/layoutlib/bridge/src/android/animation/AnimatorInflater_Delegate.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

    }

}

tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateClassAdapter.java

+1 −0
Original line number Diff line number Diff line
@@ -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);