summaryrefslogtreecommitdiffstats
path: root/core/java/android/transition
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2013-10-09 16:13:54 -0700
committerGeorge Mount <mount@google.com>2013-10-11 12:06:45 -0700
commit1ffb280a7d2c70cc16d709c685f5d31fdb86b5e4 (patch)
tree2c3ec4bd5cc976b18527815b474a9a1fa634cfa2 /core/java/android/transition
parentb44c4439ad237913de03908cd0751b285b18f787 (diff)
downloadframeworks_base-1ffb280a7d2c70cc16d709c685f5d31fdb86b5e4.zip
frameworks_base-1ffb280a7d2c70cc16d709c685f5d31fdb86b5e4.tar.gz
frameworks_base-1ffb280a7d2c70cc16d709c685f5d31fdb86b5e4.tar.bz2
Add ofArgb to ObjectAnimator and ValueAnimator.
Bug 10396985 Change-Id: Ib1fcea04b5a915800fc415b3d548a8853b05389c
Diffstat (limited to 'core/java/android/transition')
-rw-r--r--core/java/android/transition/Recolor.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/core/java/android/transition/Recolor.java b/core/java/android/transition/Recolor.java
index 70111d1..1638f67 100644
--- a/core/java/android/transition/Recolor.java
+++ b/core/java/android/transition/Recolor.java
@@ -17,7 +17,6 @@
package android.transition;
import android.animation.Animator;
-import android.animation.ArgbEvaluator;
import android.animation.ObjectAnimator;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
@@ -75,8 +74,8 @@ public class Recolor extends Transition {
if (startColor.getColor() != endColor.getColor()) {
endColor.setColor(startColor.getColor());
changed = true;
- return ObjectAnimator.ofObject(endBackground, "color",
- new ArgbEvaluator(), startColor.getColor(), endColor.getColor());
+ return ObjectAnimator.ofArgb(endBackground, "color", startColor.getColor(),
+ endColor.getColor());
}
}
if (view instanceof TextView) {
@@ -86,8 +85,7 @@ public class Recolor extends Transition {
if (start != end) {
textView.setTextColor(end);
changed = true;
- return ObjectAnimator.ofObject(textView, "textColor",
- new ArgbEvaluator(), start, end);
+ return ObjectAnimator.ofArgb(textView, "textColor", start, end);
}
}
return null;