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

Commit cf4832f6 authored by ztenghui's avatar ztenghui
Browse files

Add path support into xml files for PathInterpolator and ObjectAnimator. 

The test case is showing that AnimatedVectorDrawable is able to use path to
define time interpolator and object movement now.

Change-Id: If3c0418265d0fd762c8f5f0bb8c39cce3ad34ef3
parent 150bfcd7

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -937,6 +937,8 @@ package android { 
    field public static final int progressTintMode = 16843878; // 0x1010466

    field public static final int prompt = 16843131; // 0x101017b

    field public static final int propertyName = 16843489; // 0x10102e1

    field public static final int propertyXName = 16843894; // 0x1010476

    field public static final int propertyYName = 16843895; // 0x1010477

    field public static final int protectionLevel = 16842761; // 0x1010009

    field public static final int publicKey = 16843686; // 0x10103a6

    field public static final int queryActionMsg = 16843227; // 0x10101db

core/java/android/animation/AnimatorInflater.java

+108 −56
Original line number Diff line number Diff line
@@ -17,11 +17,13 @@ package android.animation; 


import android.content.Context;

import android.content.res.Resources;

import android.content.res.Resources.NotFoundException;

import android.content.res.Resources.Theme;

import android.content.res.TypedArray;

import android.content.res.XmlResourceParser;

import android.content.res.Resources.NotFoundException;

import android.graphics.Path;

import android.util.AttributeSet;

import android.util.PathParser;

import android.util.StateSet;

import android.util.TypedValue;

import android.util.Xml;
@@ -158,7 +160,7 @@ public class AnimatorInflater { 
                        int stateIndex = 0;

                        for (int i = 0; i < attributeCount; i++) {

                            int attrName = attributeSet.getAttributeNameResource(i);

                            if (attrName == com.android.internal.R.attr.animation) {

                            if (attrName == R.attr.animation) {

                                animator = loadAnimator(context,

                                        attributeSet.getAttributeResourceValue(i, 0));

                            } else {
@@ -186,29 +188,36 @@ public class AnimatorInflater { 
        }

    }



    /**

     * @param anim Null if this is a ValueAnimator, otherwise this is an

     *            ObjectAnimator

     * @param arrayAnimator Incoming typed array for Animator's attributes.

     * @param arrayObjectAnimator Incoming typed array for Object Animator's

     *            attributes.

     */

    private static void parseAnimatorFromTypeArray(ValueAnimator anim,

            TypedArray arrayAnimator, TypedArray arrayObjectAnimator) {

        long duration = arrayAnimator.getInt(R.styleable.Animator_duration, 300);



    private static void parseAnimatorFromTypeArray(ValueAnimator anim, TypedArray a) {

        long duration = a.getInt(com.android.internal.R.styleable.Animator_duration, 300);



        long startDelay = a.getInt(com.android.internal.R.styleable.Animator_startOffset, 0);

        long startDelay = arrayAnimator.getInt(R.styleable.Animator_startOffset, 0);



        int valueType = a.getInt(com.android.internal.R.styleable.Animator_valueType,

        int valueType = arrayAnimator.getInt(R.styleable.Animator_valueType,

                VALUE_TYPE_FLOAT);



        if (anim == null) {

            anim = new ValueAnimator();

        }

        TypeEvaluator evaluator = null;



        int valueFromIndex = com.android.internal.R.styleable.Animator_valueFrom;

        int valueToIndex = com.android.internal.R.styleable.Animator_valueTo;

        TypeEvaluator evaluator = null;

        int valueFromIndex = R.styleable.Animator_valueFrom;

        int valueToIndex = R.styleable.Animator_valueTo;



        boolean getFloats = (valueType == VALUE_TYPE_FLOAT);



        TypedValue tvFrom = a.peekValue(valueFromIndex);

        TypedValue tvFrom = arrayAnimator.peekValue(valueFromIndex);

        boolean hasFrom = (tvFrom != null);

        int fromType = hasFrom ? tvFrom.type : 0;

        TypedValue tvTo = a.peekValue(valueToIndex);

        TypedValue tvTo = arrayAnimator.peekValue(valueToIndex);

        boolean hasTo = (tvTo != null);

        int toType = hasTo ? tvTo.type : 0;
@@ -226,15 +235,15 @@ public class AnimatorInflater { 
            float valueTo;

            if (hasFrom) {

                if (fromType == TypedValue.TYPE_DIMENSION) {

                    valueFrom = a.getDimension(valueFromIndex, 0f);

                    valueFrom = arrayAnimator.getDimension(valueFromIndex, 0f);

                } else {

                    valueFrom = a.getFloat(valueFromIndex, 0f);

                    valueFrom = arrayAnimator.getFloat(valueFromIndex, 0f);

                }

                if (hasTo) {

                    if (toType == TypedValue.TYPE_DIMENSION) {

                        valueTo = a.getDimension(valueToIndex, 0f);

                        valueTo = arrayAnimator.getDimension(valueToIndex, 0f);

                    } else {

                        valueTo = a.getFloat(valueToIndex, 0f);

                        valueTo = arrayAnimator.getFloat(valueToIndex, 0f);

                    }

                    anim.setFloatValues(valueFrom, valueTo);

                } else {
@@ -242,9 +251,9 @@ public class AnimatorInflater { 
                }

            } else {

                if (toType == TypedValue.TYPE_DIMENSION) {

                    valueTo = a.getDimension(valueToIndex, 0f);

                    valueTo = arrayAnimator.getDimension(valueToIndex, 0f);

                } else {

                    valueTo = a.getFloat(valueToIndex, 0f);

                    valueTo = arrayAnimator.getFloat(valueToIndex, 0f);

                }

                anim.setFloatValues(valueTo);

            }
@@ -253,21 +262,21 @@ public class AnimatorInflater { 
            int valueTo;

            if (hasFrom) {

                if (fromType == TypedValue.TYPE_DIMENSION) {

                    valueFrom = (int) a.getDimension(valueFromIndex, 0f);

                    valueFrom = (int) arrayAnimator.getDimension(valueFromIndex, 0f);

                } else if ((fromType >= TypedValue.TYPE_FIRST_COLOR_INT) &&

                        (fromType <= TypedValue.TYPE_LAST_COLOR_INT)) {

                    valueFrom = a.getColor(valueFromIndex, 0);

                    valueFrom = arrayAnimator.getColor(valueFromIndex, 0);

                } else {

                    valueFrom = a.getInt(valueFromIndex, 0);

                    valueFrom = arrayAnimator.getInt(valueFromIndex, 0);

                }

                if (hasTo) {

                    if (toType == TypedValue.TYPE_DIMENSION) {

                        valueTo = (int) a.getDimension(valueToIndex, 0f);

                        valueTo = (int) arrayAnimator.getDimension(valueToIndex, 0f);

                    } else if ((toType >= TypedValue.TYPE_FIRST_COLOR_INT) &&

                            (toType <= TypedValue.TYPE_LAST_COLOR_INT)) {

                        valueTo = a.getColor(valueToIndex, 0);

                        valueTo = arrayAnimator.getColor(valueToIndex, 0);

                    } else {

                        valueTo = a.getInt(valueToIndex, 0);

                        valueTo = arrayAnimator.getInt(valueToIndex, 0);

                    }

                    anim.setIntValues(valueFrom, valueTo);

                } else {
@@ -276,12 +285,12 @@ public class AnimatorInflater { 
            } else {

                if (hasTo) {

                    if (toType == TypedValue.TYPE_DIMENSION) {

                        valueTo = (int) a.getDimension(valueToIndex, 0f);

                        valueTo = (int) arrayAnimator.getDimension(valueToIndex, 0f);

                    } else if ((toType >= TypedValue.TYPE_FIRST_COLOR_INT) &&

                            (toType <= TypedValue.TYPE_LAST_COLOR_INT)) {

                        valueTo = a.getColor(valueToIndex, 0);

                        valueTo = arrayAnimator.getColor(valueToIndex, 0);

                    } else {

                        valueTo = a.getInt(valueToIndex, 0);

                        valueTo = arrayAnimator.getInt(valueToIndex, 0);

                    }

                    anim.setIntValues(valueTo);

                }
@@ -291,18 +300,59 @@ public class AnimatorInflater { 
        anim.setDuration(duration);

        anim.setStartDelay(startDelay);



        if (a.hasValue(com.android.internal.R.styleable.Animator_repeatCount)) {

        if (arrayAnimator.hasValue(R.styleable.Animator_repeatCount)) {

            anim.setRepeatCount(

                    a.getInt(com.android.internal.R.styleable.Animator_repeatCount, 0));

                    arrayAnimator.getInt(R.styleable.Animator_repeatCount, 0));

        }

        if (a.hasValue(com.android.internal.R.styleable.Animator_repeatMode)) {

        if (arrayAnimator.hasValue(R.styleable.Animator_repeatMode)) {

            anim.setRepeatMode(

                    a.getInt(com.android.internal.R.styleable.Animator_repeatMode,

                    arrayAnimator.getInt(R.styleable.Animator_repeatMode,

                            ValueAnimator.RESTART));

        }

        if (evaluator != null) {

            anim.setEvaluator(evaluator);

        }



        if (arrayObjectAnimator != null) {

            ObjectAnimator oa = (ObjectAnimator) anim;

            String pathData = arrayObjectAnimator.getString(R.styleable.PropertyAnimator_pathData);



            // Note that if there is a pathData defined in the Object Animator,

            // valueFrom / valueTo will be overwritten by the pathData.

            if (pathData != null) {

                String propertyXName =

                        arrayObjectAnimator.getString(R.styleable.PropertyAnimator_propertyXName);

                String propertyYName =

                        arrayObjectAnimator.getString(R.styleable.PropertyAnimator_propertyYName);



                if (propertyXName == null && propertyYName == null) {

                    throw new IllegalArgumentException("propertyXName or propertyYName"

                            + " is needed for PathData in Object Animator");

                } else {

                    Path path = PathParser.createPathFromPathData(pathData);

                    Keyframe[][] keyframes = PropertyValuesHolder.createKeyframes(path, !getFloats);

                    PropertyValuesHolder x = null;

                    PropertyValuesHolder y = null;

                    if (propertyXName != null) {

                        x = PropertyValuesHolder.ofKeyframe(propertyXName, keyframes[0]);

                    }

                    if (propertyYName != null) {

                        y = PropertyValuesHolder.ofKeyframe(propertyYName, keyframes[1]);

                    }

                    if (x == null) {

                        oa.setValues(y);

                    } else if (y == null) {

                        oa.setValues(x);

                    } else {

                        oa.setValues(x, y);

                    }

                }

            } else {

                String propertyName =

                        arrayObjectAnimator.getString(R.styleable.PropertyAnimator_propertyName);

                oa.setPropertyName(propertyName);

            }

        }

    }



    private static Animator createAnimatorFromXml(Resources res, Theme theme, XmlPullParser parser)
@@ -338,11 +388,11 @@ public class AnimatorInflater { 
                anim = new AnimatorSet();

                TypedArray a;

                if (theme != null) {

                    a = theme.obtainStyledAttributes(attrs, com.android.internal.R.styleable.AnimatorSet, 0, 0);

                    a = theme.obtainStyledAttributes(attrs, R.styleable.AnimatorSet, 0, 0);

                } else {

                    a = res.obtainAttributes(attrs, com.android.internal.R.styleable.AnimatorSet);

                    a = res.obtainAttributes(attrs, R.styleable.AnimatorSet);

                }

                int ordering = a.getInt(com.android.internal.R.styleable.AnimatorSet_ordering,

                int ordering = a.getInt(R.styleable.AnimatorSet_ordering,

                        TOGETHER);

                createAnimatorFromXml(res, theme, parser, attrs, (AnimatorSet) anim, ordering);

                a.recycle();
@@ -380,19 +430,6 @@ public class AnimatorInflater { 


        loadAnimator(res, theme, attrs, anim);



        TypedArray a;

        if (theme != null) {

            a = theme.obtainStyledAttributes(attrs, R.styleable.PropertyAnimator, 0, 0);

        } else {

            a = res.obtainAttributes(attrs, R.styleable.PropertyAnimator);

        }



        String propertyName = a.getString(R.styleable.PropertyAnimator_propertyName);



        anim.setPropertyName(propertyName);



        a.recycle();



        return anim;

    }
@@ -402,26 +439,41 @@ public class AnimatorInflater { 
     *

     * @param res The resources

     * @param attrs The set of attributes holding the animation parameters

     * @param anim Null if this is a ValueAnimator, otherwise this is an

     *            ObjectAnimator

     */

    private static ValueAnimator loadAnimator(Resources res, Theme theme,

            AttributeSet attrs, ValueAnimator anim)

            throws NotFoundException {



        TypedArray a;

        TypedArray arrayAnimator = null;

        TypedArray arrayObjectAnimator = null;



        if (theme != null) {

            a = theme.obtainStyledAttributes(attrs, R.styleable.Animator, 0, 0);

            arrayAnimator = theme.obtainStyledAttributes(attrs, R.styleable.Animator, 0, 0);

        } else {

            a = res.obtainAttributes(attrs, R.styleable.Animator);

            arrayAnimator = res.obtainAttributes(attrs, R.styleable.Animator);

        }



        parseAnimatorFromTypeArray(anim, a);

        // If anim is not null, then it is an object animator.

        if (anim != null) {

            if (theme != null) {

                arrayObjectAnimator = theme.obtainStyledAttributes(attrs,

                        R.styleable.PropertyAnimator, 0, 0);

            } else {

                arrayObjectAnimator = res.obtainAttributes(attrs, R.styleable.PropertyAnimator);

            }

        }

        parseAnimatorFromTypeArray(anim, arrayAnimator, arrayObjectAnimator);



        final int resID =

                a.getResourceId(com.android.internal.R.styleable.Animator_interpolator, 0);

                arrayAnimator.getResourceId(R.styleable.Animator_interpolator, 0);

        if (resID > 0) {

            anim.setInterpolator(AnimationUtils.loadInterpolator(res, theme, resID));

        }

        a.recycle();



        arrayAnimator.recycle();

        arrayObjectAnimator.recycle();



        return anim;

    }

core/java/android/util/PathParser.java

0 → 100644
+528 −0

File added.

Preview size limit exceeded, changes collapsed.

core/java/android/view/animation/PathInterpolator.java

+32 −20
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.res.Resources.Theme; 
import android.content.res.TypedArray;

import android.graphics.Path;

import android.util.AttributeSet;

import android.util.PathParser;

import android.view.InflateException;



import com.android.internal.R;
@@ -102,6 +103,17 @@ public class PathInterpolator implements Interpolator { 
    }



    private void parseInterpolatorFromTypeArray(TypedArray a) {

        // If there is pathData defined in the xml file, then the controls points

        // will be all coming from pathData.

        if (a.hasValue(R.styleable.PathInterpolator_pathData)) {

            String pathData = a.getString(R.styleable.PathInterpolator_pathData);

            Path path = PathParser.createPathFromPathData(pathData);

            if (path == null) {

                throw new InflateException("The path is null, which is created"

                        + " from " + pathData);

            }

            initPath(path);

        } else {

            if (!a.hasValue(R.styleable.PathInterpolator_controlX1)) {

                throw new InflateException("pathInterpolator requires the controlX1 attribute");

            } else if (!a.hasValue(R.styleable.PathInterpolator_controlY1)) {
@@ -126,6 +138,7 @@ public class PathInterpolator implements Interpolator { 
                initCubic(x1, y1, x2, y2);

            }

        }

    }



    private void initQuad(float controlX, float controlY) {

        Path path = new Path();
@@ -216,5 +229,4 @@ public class PathInterpolator implements Interpolator { 
        float endY = mY[endIndex];

        return startY + (fraction * (endY - startY));

    }



}

core/res/res/values/attrs.xml

+14 −0
Original line number Diff line number Diff line
@@ -5250,10 +5250,18 @@ 
    </declare-styleable>



    <declare-styleable name="PathInterpolator">

        <!-- The x coordinate of the first control point of the cubic Bezier -->

        <attr name="controlX1" format="float" />

        <!-- The y coordinate of the first control point of the cubic Bezier -->

        <attr name="controlY1" format="float" />

        <!-- The x coordinate of the second control point of the cubic Bezier -->

        <attr name="controlX2" format="float" />

        <!-- The y coordinate of the second control point of the cubic Bezier -->

        <attr name="controlY2" format="float" />

        <!-- The control points defined as a path.

             When pathData is defined, then both of the control points of the

             cubic Bezier will be ignored. -->

        <attr name="pathData"/>

    </declare-styleable>



    <!-- ========================== -->
@@ -5403,6 +5411,12 @@ 
    <declare-styleable name="PropertyAnimator">

        <!-- Name of the property being animated. -->

        <attr name="propertyName" format="string"/>

        <!-- Name of the property being animated as the X coordinate of the pathData. -->

        <attr name="propertyXName" format="string"/>

        <!-- Name of the property being animated as the Y coordinate of the pathData. -->

        <attr name="propertyYName" format="string"/>

        <!-- The path used to animate the properties in the ObjectAnimator -->

        <attr name="pathData"/>

    </declare-styleable>