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

Commit 4261a095 authored by George Mount's avatar George Mount Committed by android-build-merger
Browse files

Merge "Add @SafeVarargs for methods using typevar varargs." into nyc-dev 

am: 7f1bdd9f

* commit '7f1bdd9f':
  Add @SafeVarargs for methods using typevar varargs.
parents 8f4714e6 7f1bdd9f

core/java/android/animation/ObjectAnimator.java

+4 −0
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ public final class ObjectAnimator extends ValueAnimator { 
     * @param values A set of values that the animation will animate between over time.

     * @return An ObjectAnimator object that is set up to animate between the given values.

     */

    @SafeVarargs

    public static <T> ObjectAnimator ofMultiInt(Object target, String propertyName,

            TypeConverter<T, int[]> converter, TypeEvaluator<T> evaluator, T... values) {

        PropertyValuesHolder pvh = PropertyValuesHolder.ofMultiInt(propertyName, converter,
@@ -569,6 +570,7 @@ public final class ObjectAnimator extends ValueAnimator { 
     * @param values A set of values that the animation will animate between over time.

     * @return An ObjectAnimator object that is set up to animate between the given values.

     */

    @SafeVarargs

    public static <T> ObjectAnimator ofMultiFloat(Object target, String propertyName,

            TypeConverter<T, float[]> converter, TypeEvaluator<T> evaluator, T... values) {

        PropertyValuesHolder pvh = PropertyValuesHolder.ofMultiFloat(propertyName, converter,
@@ -642,6 +644,7 @@ public final class ObjectAnimator extends ValueAnimator { 
     * @return An ObjectAnimator object that is set up to animate between the given values.

     */

    @NonNull

    @SafeVarargs

    public static <T, V> ObjectAnimator ofObject(T target, Property<T, V> property,

            TypeEvaluator<V> evaluator, V... values) {

        ObjectAnimator anim = new ObjectAnimator(target, property);
@@ -670,6 +673,7 @@ public final class ObjectAnimator extends ValueAnimator { 
     * @return An ObjectAnimator object that is set up to animate between the given values.

     */

    @NonNull

    @SafeVarargs

    public static <T, V, P> ObjectAnimator ofObject(T target, Property<T, P> property,

            TypeConverter<V, P> converter, TypeEvaluator<V> evaluator, V... values) {

        PropertyValuesHolder pvh = PropertyValuesHolder.ofObject(property, converter, evaluator,

core/java/android/animation/PropertyValuesHolder.java

+4 −0
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ public class PropertyValuesHolder implements Cloneable { 
     * @see ObjectAnimator#ofMultiInt(Object, String, TypeConverter, TypeEvaluator, Object[])

     * @see ObjectAnimator#ofPropertyValuesHolder(Object, PropertyValuesHolder...)

     */

    @SafeVarargs

    public static <V> PropertyValuesHolder ofMultiInt(String propertyName,

            TypeConverter<V, int[]> converter, TypeEvaluator<V> evaluator, V... values) {

        return new MultiIntValuesHolder(propertyName, converter, evaluator, values);
@@ -353,6 +354,7 @@ public class PropertyValuesHolder implements Cloneable { 
     * @return PropertyValuesHolder The constructed PropertyValuesHolder object.

     * @see ObjectAnimator#ofMultiFloat(Object, String, TypeConverter, TypeEvaluator, Object[])

     */

    @SafeVarargs

    public static <V> PropertyValuesHolder ofMultiFloat(String propertyName,

            TypeConverter<V, float[]> converter, TypeEvaluator<V> evaluator, V... values) {

        return new MultiFloatValuesHolder(propertyName, converter, evaluator, values);
@@ -438,6 +440,7 @@ public class PropertyValuesHolder implements Cloneable { 
     * @param values The values that the property will animate between.

     * @return PropertyValuesHolder The constructed PropertyValuesHolder object.

     */

    @SafeVarargs

    public static <V> PropertyValuesHolder ofObject(Property property,

            TypeEvaluator<V> evaluator, V... values) {

        PropertyValuesHolder pvh = new PropertyValuesHolder(property);
@@ -465,6 +468,7 @@ public class PropertyValuesHolder implements Cloneable { 
     * @see #setConverter(TypeConverter)

     * @see TypeConverter

     */

    @SafeVarargs

    public static <T, V> PropertyValuesHolder ofObject(Property<?, V> property,

            TypeConverter<T, V> converter, TypeEvaluator<T> evaluator, T... values) {

        PropertyValuesHolder pvh = new PropertyValuesHolder(property);

core/java/android/app/ActivityOptions.java

+1 −0
Original line number Diff line number Diff line
@@ -621,6 +621,7 @@ public class ActivityOptions { 
     * @see android.transition.Transition#setEpicenterCallback(

     *          android.transition.Transition.EpicenterCallback)

     */

    @SafeVarargs

    public static ActivityOptions makeSceneTransitionAnimation(Activity activity,

            Pair<View, String>... sharedElements) {

        ActivityOptions opts = new ActivityOptions();