summaryrefslogtreecommitdiff
path: root/tests/VectorDrawableTest
diff options
context:
space:
mode:
author ztenghui <ztenghui@google.com> 2014-09-23 10:58:57 -0700
committer ztenghui <ztenghui@google.com> 2014-09-23 11:22:26 -0700
commitdbcccffc3760f702887faa95b2748125bac88a89 (patch)
treed9231523830afc10f2695679b3613621bc8d3c3f /tests/VectorDrawableTest
parentfdb35f0526e63dc4d6882d86029d9beacc6a2d07 (diff)
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
Diffstat (limited to 'tests/VectorDrawableTest')
-rw-r--r--tests/VectorDrawableTest/res/anim/animation_favorite.xml30
-rw-r--r--tests/VectorDrawableTest/res/anim/trim_path_animation02.xml2
2 files changed, 31 insertions, 1 deletions
diff --git a/tests/VectorDrawableTest/res/anim/animation_favorite.xml b/tests/VectorDrawableTest/res/anim/animation_favorite.xml
index c81ba40684f7..2e2d9bbcec6d 100644
--- a/tests/VectorDrawableTest/res/anim/animation_favorite.xml
+++ b/tests/VectorDrawableTest/res/anim/animation_favorite.xml
@@ -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
diff --git a/tests/VectorDrawableTest/res/anim/trim_path_animation02.xml b/tests/VectorDrawableTest/res/anim/trim_path_animation02.xml
index 3bf2865e3d63..5d688cf8261f 100644
--- a/tests/VectorDrawableTest/res/anim/trim_path_animation02.xml
+++ b/tests/VectorDrawableTest/res/anim/trim_path_animation02.xml
@@ -19,7 +19,7 @@
<objectAnimator
android:duration="5000"
- android:propertyName="fill"
+ android:propertyName="fillColor"
android:valueFrom="#FF000000"
android:valueTo="#FFFF0000"/>