summaryrefslogtreecommitdiffstats
path: root/tests/VectorDrawableTest
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-04-10 11:14:45 -0700
committerAlan Viverette <alanv@google.com>2014-04-10 11:21:15 -0700
commit4b3988d159e1c9faa2a7e16c9aca9951264bb429 (patch)
tree73e5fcab7ae4f6dee3b3cef682ad157f54809c87 /tests/VectorDrawableTest
parent2271a91c327cee8a6c1dffcbfd3419c95d56c37e (diff)
downloadframeworks_base-4b3988d159e1c9faa2a7e16c9aca9951264bb429.zip
frameworks_base-4b3988d159e1c9faa2a7e16c9aca9951264bb429.tar.gz
frameworks_base-4b3988d159e1c9faa2a7e16c9aca9951264bb429.tar.bz2
Cleaning up VectorDrawable
Use argb evaluation method from animation package, lazily create paint, set default for stroke line cap and join. Fix scaling to bounds. Fix drawable in test app. Change-Id: I245d5d6acc6ba9806743ab2bf9bf99aff3649c39
Diffstat (limited to 'tests/VectorDrawableTest')
-rw-r--r--tests/VectorDrawableTest/res/drawable/vector_drawable01.xml14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml
index 6ca1aa7..1507058 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml
@@ -28,14 +28,14 @@
<path
android:name="check"
android:pathData="m20,200l100,90l180,-180l-35,-35l-145,145l-60,-60l-40,40z"
- android:fill="?android:attr/colorControlActivated" />
+ android:fill="?attr/colorControlActivated" />
</group>
<group>
<path
android:name="box1"
android:pathData="m127,171l37,38l33,-31l-37,-40l-1,3l-2,0l-30,30z"
- android:fill="?android:attr/colorControlActivated"
- android:stroke="?android:attr/colorControlActivated"
+ android:fill="?attr/colorControlActivated"
+ android:stroke="?attr/colorControlActivated"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
</group>
@@ -46,8 +46,8 @@
android:rotation="46.757"
android:pivotX="162"
android:pivotY="173.5"
- android:fill="?attr/android:colorControlNormal"
- android:stroke="?attr/android:colorControlNormal"
+ android:fill="?attr/colorControlNormal"
+ android:stroke="?attr/colorControlNormal"
android:strokeWidth="3"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
@@ -56,7 +56,7 @@
<path
android:name="box3"
android:pathData="m187,147l-1,55l-49,-1l2,-53l48,0z"
- android:stroke="?attr/android:colorControlNormal"
+ android:stroke="?attr/colorControlNormal"
android:strokeWidth="10"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
@@ -65,7 +65,7 @@
<path
android:name="box4"
android:pathData="m248,74l0,164l-177,0l1,-165l173,-1l3,2z"
- android:stroke="?attr/android:colorControlNormal"
+ android:stroke="?attr/colorControlNormal"
android:strokeWidth="30"
android:strokeLineCap="round"
android:strokeLineJoin="round" />