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

Commit dbcccffc authored by ztenghui's avatar ztenghui
Browse files

Fix animation on the some properties 

The risk is low since most of them are just matching the naming to xml.
And this update won't cause build breakage.

b/17623982

Change-Id: I1eda0b8314ec7b94bc03976cdc365a7dc1039f4c
parent fdb35f05

graphics/java/android/graphics/drawable/VectorDrawable.java

+8 −8
Original line number Diff line number Diff line
@@ -1456,12 +1456,12 @@ public class VectorDrawable extends Drawable { 


        /* Setters and Getters, used by animator from AnimatedVectorDrawable. */

        @SuppressWarnings("unused")

        int getStroke() {

        int getStrokeColor() {

            return mStrokeColor;

        }



        @SuppressWarnings("unused")

        void setStroke(int strokeColor) {

        void setStrokeColor(int strokeColor) {

            mStrokeColor = strokeColor;

        }
@@ -1476,32 +1476,32 @@ public class VectorDrawable extends Drawable { 
        }



        @SuppressWarnings("unused")

        float getstrokeAlpha() {

        float getStrokeAlpha() {

            return mStrokeAlpha;

        }



        @SuppressWarnings("unused")

        void setstrokeAlpha(float strokeAlpha) {

        void setStrokeAlpha(float strokeAlpha) {

            mStrokeAlpha = strokeAlpha;

        }



        @SuppressWarnings("unused")

        int getFill() {

        int getFillColor() {

            return mFillColor;

        }



        @SuppressWarnings("unused")

        void setFill(int fillColor) {

        void setFillColor(int fillColor) {

            mFillColor = fillColor;

        }



        @SuppressWarnings("unused")

        float getfillAlpha() {

        float getFillAlpha() {

            return mFillAlpha;

        }



        @SuppressWarnings("unused")

        void setfillAlpha(float fillAlpha) {

        void setFillAlpha(float fillAlpha) {

            mFillAlpha = fillAlpha;

        }

tests/VectorDrawableTest/res/anim/animation_favorite.xml

+30 −0
Original line number Diff line number Diff line
@@ -25,5 +25,35 @@ 
        android:valueFrom="@string/round_box"

        android:valueTo="@string/heart"

        android:valueType="pathType" />

    <objectAnimator

        android:duration="8000"

        android:propertyName="fillAlpha"

        android:repeatCount="-1"

        android:valueFrom="1.0"

        android:valueTo="0.0" />

    <objectAnimator

        android:duration="8000"

        android:propertyName="strokeAlpha"

        android:repeatCount="-1"

        android:valueFrom="1.0"

        android:valueTo="0.0" />

    <objectAnimator

        android:duration="8000"

        android:propertyName="strokeColor"

        android:repeatCount="-1"

        android:valueFrom="#FF0000FF"

        android:valueTo="#FF00FF00" />

    <objectAnimator

        android:duration="8000"

        android:propertyName="strokeWidth"

        android:repeatCount="-1"

        android:valueFrom="5"

        android:valueTo="20" />

    <objectAnimator

        android:duration="8000"

        android:propertyName="fillColor"

        android:repeatCount="-1"

        android:valueFrom="#FFFF0000"

        android:valueTo="#FF00FF00" />



</set>
 
 No newline at end of file

tests/VectorDrawableTest/res/anim/trim_path_animation02.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


    <objectAnimator

        android:duration="5000"

        android:propertyName="fill"

        android:propertyName="fillColor"

        android:valueFrom="#FF000000"

        android:valueTo="#FFFF0000"/>