Add string support for valueFrom/valueTo
b/15910407
Change-Id: I557e855f7d16e2eb0452d43ca6a672acdcae2071
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index a092160..e7e750d 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -5447,9 +5447,9 @@
greater than 0 or infinite. The default value is restart. -->
<attr name="repeatMode"/>
<!-- Value the animation starts from. -->
- <attr name="valueFrom" format="float|integer|color|dimension"/>
+ <attr name="valueFrom" format="float|integer|color|dimension|string"/>
<!-- Value the animation animates to. -->
- <attr name="valueTo" format="float|integer|color|dimension"/>
+ <attr name="valueTo" format="float|integer|color|dimension|string"/>
<!-- The type of valueFrom and valueTo. -->
<attr name="valueType">
<!-- valueFrom and valueTo are floats. This is the default value is valueType is
diff --git a/tests/VectorDrawableTest/res/anim/trim_path_animation05.xml b/tests/VectorDrawableTest/res/anim/trim_path_animation05.xml
index 7012f4b..92b1ab5 100644
--- a/tests/VectorDrawableTest/res/anim/trim_path_animation05.xml
+++ b/tests/VectorDrawableTest/res/anim/trim_path_animation05.xml
@@ -21,8 +21,8 @@
<objectAnimator
android:duration="3000"
android:propertyName="pathData"
- android:valueFrom="@string/triangle"
- android:valueTo="@string/rectangle"
+ android:valueFrom="M300,70 l 0,-70 70,70 0,0 -70,70z"
+ android:valueTo= "M300,70 l 0,-70 70,0 0,140 -70,0 z"
android:valueType="pathType"/>
<objectAnimator