summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorztenghui <ztenghui@google.com>2015-06-24 21:27:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-24 21:27:15 +0000
commit9336eb5d1c962d6e4cd66a1ce3333da510dfd6d5 (patch)
tree0e0a16b80e595236d1396f3bff7b8b689d83ecfb /tests
parent6301d802244f6e6c9fc6084e4bedd20ba0bd3064 (diff)
parent92537303a24f6f5caa35fc6e9f22602ddf934b0e (diff)
downloadframeworks_base-9336eb5d1c962d6e4cd66a1ce3333da510dfd6d5.zip
frameworks_base-9336eb5d1c962d6e4cd66a1ce3333da510dfd6d5.tar.gz
frameworks_base-9336eb5d1c962d6e4cd66a1ce3333da510dfd6d5.tar.bz2
Merge "Update the internal test case to show the strokeWidth can scale now" into mnc-dev
Diffstat (limited to 'tests')
-rw-r--r--tests/VectorDrawableTest/res/anim/animation_favorite.xml6
-rw-r--r--tests/VectorDrawableTest/res/drawable/vector_drawable_favorite.xml1
2 files changed, 1 insertions, 6 deletions
diff --git a/tests/VectorDrawableTest/res/anim/animation_favorite.xml b/tests/VectorDrawableTest/res/anim/animation_favorite.xml
index 2e2d9bb..13bd6f5 100644
--- a/tests/VectorDrawableTest/res/anim/animation_favorite.xml
+++ b/tests/VectorDrawableTest/res/anim/animation_favorite.xml
@@ -45,12 +45,6 @@
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"
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable_favorite.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable_favorite.xml
index 7be49a9..f93486e 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable_favorite.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable_favorite.xml
@@ -26,6 +26,7 @@
<path
android:name="favorite"
android:fillColor="#ff000000"
+ android:strokeWidth="2"
android:pathData="M2.100006104,-6
C0.1449127197,-6,1.600006104,-5.975006104,0,-5.975006104
C-1.574996948,-5.975006104,0.00309753418,-6-1.949996948-6