commit 9ec5e253a51a2d4a73da4c38505bc5c79aeb7a02
author Justin Klaassen <justinklaassen@google.com> Mon Nov 24 21:09:00 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 24 21:09:00 2014 +0000
tree 24972324627e9d051ac67aee900ef174c09da3d0
parent c92ae39846f57d569a6904f5a127184e2946788d
parent 1b4fd74d2aace67a8cf7689697b758c53eb37cf7

am 1b4fd74d: Adopt new ValueAnimator#setCurrentFraction(float) API

* commit '1b4fd74d2aace67a8cf7689697b758c53eb37cf7':
  Adopt new ValueAnimator#setCurrentFraction(float) API

src/com/android/deskclock/AnimatorUtils.java

diff --git a/src/com/android/deskclock/AnimatorUtils.java b/src/com/android/deskclock/AnimatorUtils.java
index ffedcab..fe90a7d 100644
--- a/src/com/android/deskclock/AnimatorUtils.java
+++ b/src/com/android/deskclock/AnimatorUtils.java
@@ -81,39 +81,11 @@
 
     public static final TypeEvaluator ARGB_EVALUATOR = new ArgbEvaluator();
 
-    private static Method sAnimateValue;
-    private static boolean sTryAnimateValue = true;
-
-    public static void setAnimatedFraction(ValueAnimator animator, float fraction) {
-        if (sTryAnimateValue) {
-            // try to set the animated fraction directly so that it isn't affected by the
-            // internal animator scale or time (b/17938711)
-            try {
-                if (sAnimateValue == null) {
-                    sAnimateValue = ValueAnimator.class
-                            .getDeclaredMethod("animateValue", float.class);
-                    sAnimateValue.setAccessible(true);
-                }
-
-                sAnimateValue.invoke(animator, fraction);
-                return;
-            } catch (NoSuchMethodException|InvocationTargetException|IllegalAccessException e) {
-                // something went wrong, don't try that again
-                LogUtils.e("Unable to use animateValue directly", e);
-                sTryAnimateValue = false;
-            }
-        }
-
-        // if that doesn't work then just fall back to setting the current play time
-        animator.setCurrentPlayTime(Math.round(fraction * animator.getDuration()));
-    }
-
     public static void start(ValueAnimator... animators) {
         for (ValueAnimator animator : animators) {
             final float fraction = animator.getAnimatedFraction();
             if (fraction < 1.0f) {
                 animator.start();
-                setAnimatedFraction(animator, fraction);
             }
         }
     }
@@ -123,7 +95,6 @@
             final float fraction = animator.getAnimatedFraction();
             if (fraction > 0.0f) {
                 animator.reverse();
-                setAnimatedFraction(animator, 1.0f - fraction);
             }
         }
     }

src/com/android/deskclock/alarms/AlarmActivity.java

diff --git a/src/com/android/deskclock/alarms/AlarmActivity.java b/src/com/android/deskclock/alarms/AlarmActivity.java
index 5639d4a..753d5d9 100644
--- a/src/com/android/deskclock/alarms/AlarmActivity.java
+++ b/src/com/android/deskclock/alarms/AlarmActivity.java
@@ -381,9 +381,9 @@
 
     private void setAnimatedFractions(float snoozeFraction, float dismissFraction) {
         final float alarmFraction = Math.max(snoozeFraction, dismissFraction);
-        AnimatorUtils.setAnimatedFraction(mAlarmAnimator, alarmFraction);
-        AnimatorUtils.setAnimatedFraction(mSnoozeAnimator, snoozeFraction);
-        AnimatorUtils.setAnimatedFraction(mDismissAnimator, dismissFraction);
+        mAlarmAnimator.setCurrentFraction(alarmFraction);
+        mSnoozeAnimator.setCurrentFraction(snoozeFraction);
+        mDismissAnimator.setCurrentFraction(dismissFraction);
     }
 
     private float getFraction(float x0, float x1, float x) {