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

Commit cf6f0d58 authored by Chet Haase's avatar Chet Haase Committed by Android (Google) Code Review
Browse files

Merge "multiple-property animations"

parents 2338f48d d953d08e

api/current.xml

+60 −166
Original line number Diff line number Diff line
@@ -19952,67 +19952,24 @@ 
>

<parameter name="duration" type="long">

</parameter>

<parameter name="keyframes" type="android.animation.Keyframe...">

<parameter name="values" type="T...">

</parameter>

</constructor>

<constructor name="Animator"

 type="android.animation.Animator"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="duration" type="long">

</parameter>

<parameter name="valueFrom" type="float">

</parameter>

<parameter name="valueTo" type="float">

</parameter>

</constructor>

<constructor name="Animator"

 type="android.animation.Animator"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="duration" type="long">

</parameter>

<parameter name="valueFrom" type="int">

</parameter>

<parameter name="valueTo" type="int">

</parameter>

</constructor>

<constructor name="Animator"

 type="android.animation.Animator"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="duration" type="long">

</parameter>

<parameter name="valueFrom" type="double">

</parameter>

<parameter name="valueTo" type="double">

</parameter>

</constructor>

<constructor name="Animator"

 type="android.animation.Animator"

<method name="addUpdateListener"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="duration" type="long">

</parameter>

<parameter name="valueFrom" type="java.lang.Object">

</parameter>

<parameter name="valueTo" type="java.lang.Object">

<parameter name="listener" type="android.animation.Animator.AnimatorUpdateListener">

</parameter>

</constructor>

<method name="addUpdateListener"

 return="void"

</method>

<method name="getAnimatedValue"

 return="java.lang.Object"

 abstract="false"

 native="false"

 synchronized="false"
@@ -20021,8 +19978,6 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="listener" type="android.animation.Animator.AnimatorUpdateListener">

</parameter>

</method>

<method name="getAnimatedValue"

 return="java.lang.Object"
@@ -20034,6 +19989,8 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="propertyName" type="java.lang.String">

</parameter>

</method>

<method name="getCurrentPlayTime"

 return="long"
@@ -20090,28 +20047,6 @@ 
 visibility="public"

>

</method>

<method name="getValueFrom"

 return="java.lang.Object"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getValueTo"

 return="java.lang.Object"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isRunning"

 return="boolean"

 abstract="false"
@@ -20238,7 +20173,7 @@ 
<parameter name="startDelay" type="long">

</parameter>

</method>

<method name="setValueFrom"

<method name="setValues"

 return="void"

 abstract="false"

 native="false"
@@ -20248,10 +20183,10 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="valueFrom" type="java.lang.Object">

<parameter name="values" type="android.animation.PropertyValuesHolder...">

</parameter>

</method>

<method name="setValueTo"

<method name="setValues"

 return="void"

 abstract="false"

 native="false"
@@ -20261,7 +20196,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="valueTo" type="java.lang.Object">

<parameter name="values" type="T...">

</parameter>

</method>

<field name="INFINITE"
@@ -20594,15 +20529,13 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="duration" type="int">

<parameter name="duration" type="long">

</parameter>

<parameter name="target" type="java.lang.Object">

</parameter>

<parameter name="propertyName" type="java.lang.String">

</parameter>

<parameter name="valueFrom" type="float">

</parameter>

<parameter name="valueTo" type="float">

<parameter name="values" type="T...">

</parameter>

</constructor>

<constructor name="PropertyAnimator"
@@ -20612,131 +20545,90 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="duration" type="int">

<parameter name="duration" type="long">

</parameter>

<parameter name="target" type="java.lang.Object">

</parameter>

<parameter name="propertyName" type="java.lang.String">

</parameter>

<parameter name="valueTo" type="float">

<parameter name="values" type="android.animation.PropertyValuesHolder...">

</parameter>

</constructor>

<constructor name="PropertyAnimator"

 type="android.animation.PropertyAnimator"

<method name="getPropertyName"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="duration" type="int">

</parameter>

<parameter name="target" type="java.lang.Object">

</parameter>

<parameter name="propertyName" type="java.lang.String">

</parameter>

<parameter name="valueFrom" type="int">

</parameter>

<parameter name="valueTo" type="int">

</parameter>

</constructor>

<constructor name="PropertyAnimator"

 type="android.animation.PropertyAnimator"

</method>

<method name="getTarget"

 return="java.lang.Object"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="duration" type="int">

</parameter>

<parameter name="target" type="java.lang.Object">

</parameter>

<parameter name="propertyName" type="java.lang.String">

</parameter>

<parameter name="valueTo" type="int">

</parameter>

</constructor>

<constructor name="PropertyAnimator"

 type="android.animation.PropertyAnimator"

</method>

<method name="setPropertyName"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="duration" type="int">

</parameter>

<parameter name="target" type="java.lang.Object">

</parameter>

<parameter name="propertyName" type="java.lang.String">

</parameter>

<parameter name="valueFrom" type="double">

</parameter>

<parameter name="valueTo" type="double">

</parameter>

</constructor>

<constructor name="PropertyAnimator"

 type="android.animation.PropertyAnimator"

</method>

<method name="setTarget"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="duration" type="int">

</parameter>

<parameter name="target" type="java.lang.Object">

</parameter>

<parameter name="propertyName" type="java.lang.String">

</parameter>

<parameter name="valueTo" type="double">

</parameter>

</constructor>

<constructor name="PropertyAnimator"

 type="android.animation.PropertyAnimator"

</method>

</class>

<class name="PropertyValuesHolder"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="duration" type="int">

</parameter>

<parameter name="target" type="java.lang.Object">

</parameter>

<parameter name="propertyName" type="java.lang.String">

</parameter>

<parameter name="valueFrom" type="java.lang.Object">

</parameter>

<parameter name="valueTo" type="java.lang.Object">

</parameter>

</constructor>

<constructor name="PropertyAnimator"

 type="android.animation.PropertyAnimator"

<constructor name="PropertyValuesHolder"

 type="android.animation.PropertyValuesHolder"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="duration" type="int">

</parameter>

<parameter name="target" type="java.lang.Object">

</parameter>

<parameter name="propertyName" type="java.lang.String">

</parameter>

<parameter name="valueTo" type="java.lang.Object">

<parameter name="values" type="T...">

</parameter>

</constructor>

<constructor name="PropertyAnimator"

 type="android.animation.PropertyAnimator"

<constructor name="PropertyValuesHolder"

 type="android.animation.PropertyValuesHolder"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="duration" type="int">

</parameter>

<parameter name="target" type="java.lang.Object">

</parameter>

<parameter name="propertyName" type="java.lang.String">

</parameter>

<parameter name="keyframes" type="android.animation.Keyframe...">

<parameter name="values" type="T...">

</parameter>

</constructor>

<method name="getGetter"
@@ -20772,8 +20664,8 @@ 
 visibility="public"

>

</method>

<method name="getTarget"

 return="java.lang.Object"

<method name="setEvaluator"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"
@@ -20782,6 +20674,8 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="evaluator" type="android.animation.TypeEvaluator">

</parameter>

</method>

<method name="setGetter"

 return="void"
@@ -20822,7 +20716,7 @@ 
<parameter name="setter" type="java.lang.reflect.Method">

</parameter>

</method>

<method name="setTarget"

<method name="setValues"

 return="void"

 abstract="false"

 native="false"
@@ -20832,7 +20726,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="target" type="java.lang.Object">

<parameter name="values" type="T...">

</parameter>

</method>

</class>

core/java/android/animation/Animator.java

+121 −193

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/animation/DoubleEvaluator.java

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ public class DoubleEvaluator implements TypeEvaluator { 
     *         <code>fraction</code> parameter.

     */

    public Object evaluate(float fraction, Object startValue, Object endValue) {

        double startDouble = (Double) startValue;

        return startDouble + fraction * ((Double) endValue - startDouble);

        double startDouble = ((Number) startValue).doubleValue();

        return startDouble + fraction * (((Number) endValue).doubleValue() - startDouble);

    }

}
 
 No newline at end of file

core/java/android/animation/FloatEvaluator.java

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ public class FloatEvaluator implements TypeEvaluator { 
     *         <code>fraction</code> parameter.

     */

    public Object evaluate(float fraction, Object startValue, Object endValue) {

        float startFloat = (Float) startValue;

        return startFloat + fraction * ((Float) endValue - startFloat);

        float startFloat = ((Number) startValue).floatValue();

        return startFloat + fraction * (((Number) endValue).floatValue() - startFloat);

    }

}
 
 No newline at end of file

core/java/android/animation/IntEvaluator.java

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ public class IntEvaluator implements TypeEvaluator { 
     *         <code>fraction</code> parameter.

     */

    public Object evaluate(float fraction, Object startValue, Object endValue) {

        int startInt = (Integer) startValue;

        return (int) (startInt + fraction * ((Integer) endValue - startInt));

        int startInt = ((Number) startValue).intValue();

        return (int) (startInt + fraction * (((Number) endValue).intValue() - startInt));

    }

}
 
 No newline at end of file