diff options
| author | George Mount <mount@google.com> | 2014-06-24 13:50:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-23 21:44:43 +0000 |
| commit | 16ffa8d3ef3d0a45efbca9fa7b4b32ba4ebd1e07 (patch) | |
| tree | 8eeb9802bd874d51b87053ec983732ac24acfb5f | |
| parent | 67565a09f59db91ee0ebcdcf29b9bae0fb17ec32 (diff) | |
| parent | f505b1f08d606688881d56591d018c0d9162d739 (diff) | |
| download | frameworks_base-16ffa8d3ef3d0a45efbca9fa7b4b32ba4ebd1e07.zip frameworks_base-16ffa8d3ef3d0a45efbca9fa7b4b32ba4ebd1e07.tar.gz frameworks_base-16ffa8d3ef3d0a45efbca9fa7b4b32ba4ebd1e07.tar.bz2 | |
Merge "Use Property for ofFloat with Path."
| -rw-r--r-- | core/java/android/animation/ObjectAnimator.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/animation/ObjectAnimator.java b/core/java/android/animation/ObjectAnimator.java index 8947550..da56a77 100644 --- a/core/java/android/animation/ObjectAnimator.java +++ b/core/java/android/animation/ObjectAnimator.java @@ -469,7 +469,10 @@ public final class ObjectAnimator extends ValueAnimator { */ public static <T> ObjectAnimator ofFloat(T target, Property<T, Float> xProperty, Property<T, Float> yProperty, Path path) { - return ofFloat(target, xProperty.getName(), yProperty.getName(), path); + Keyframe[][] keyframes = PropertyValuesHolder.createKeyframes(path, false); + PropertyValuesHolder x = PropertyValuesHolder.ofKeyframe(xProperty, keyframes[0]); + PropertyValuesHolder y = PropertyValuesHolder.ofKeyframe(yProperty, keyframes[1]); + return ofPropertyValuesHolder(target, x, y); } /** |