diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-10-29 18:52:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-29 18:52:21 +0000 |
| commit | 5456230d3b071cf699a4523f3f33bfcb5be4f54c (patch) | |
| tree | 62d1c27b947a5ab65f304359976486c0005eadaf /tools | |
| parent | 9bff44bdc4d91a1502bf2d30c0cbbe76751657f1 (diff) | |
| parent | 03b100e11dad5bef34e71ccfd45b6c7adc9bfee4 (diff) | |
| download | frameworks_base-5456230d3b071cf699a4523f3f33bfcb5be4f54c.zip frameworks_base-5456230d3b071cf699a4523f3f33bfcb5be4f54c.tar.gz frameworks_base-5456230d3b071cf699a4523f3f33bfcb5be4f54c.tar.bz2 | |
am 03b100e1: am 617e8097: Add missing delegate for AnimatorInflater.
* commit '03b100e11dad5bef34e71ccfd45b6c7adc9bfee4':
Add missing delegate for AnimatorInflater.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/android/animation/AnimatorInflater_Delegate.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/src/android/animation/AnimatorInflater_Delegate.java b/tools/layoutlib/bridge/src/android/animation/AnimatorInflater_Delegate.java index 8ced2db..d8a6ffc 100644 --- a/tools/layoutlib/bridge/src/android/animation/AnimatorInflater_Delegate.java +++ b/tools/layoutlib/bridge/src/android/animation/AnimatorInflater_Delegate.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.res.Resources; import android.content.res.Resources.NotFoundException; import android.content.res.Resources.Theme; +import android.util.AttributeSet; /** * Delegate providing alternate implementation to static methods in {@link AnimatorInflater}. @@ -48,4 +49,11 @@ public class AnimatorInflater_Delegate { // TODO: Remove this override when Path.approximate() is supported. return new FakeAnimator(); } + + @LayoutlibDelegate + /*package*/ static ValueAnimator loadAnimator(Resources res, Theme theme, + AttributeSet attrs, ValueAnimator anim, float pathErrorScale) + throws NotFoundException { + return anim; + } } |