Theming for more VectorDrawable attrs, add attrs to test app

BUG: 13878079
Change-Id: Ibcc8d67446c44cd8f681230fc484c7dc7411ffab

2 files changed, 21 insertions, 16 deletions

diff --git a/tests/VectorDrawableTest/AndroidManifest.xml b/tests/VectorDrawableTest/AndroidManifest.xml
index 06effe2..28c5f33 100644
--- a/tests/VectorDrawableTest/AndroidManifest.xml
+++ b/tests/VectorDrawableTest/AndroidManifest.xml
@@ -17,7 +17,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.test.dynamic" >
-    <uses-sdk android:minSdkVersion="11" />
+    <uses-sdk android:minSdkVersion="20" />
 
     <application
         android:hardwareAccelerated="true"
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml
index 538993f..6ca1aa7 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml
@@ -17,8 +17,8 @@
     android:trigger="state_checked" android:versionCode="1" >
 
     <size
-        android:height="64dp"
-        android:width="64dp" />
+        android:height="48dp"
+        android:width="48dp" />
 
     <viewport
         android:viewportHeight="480"
@@ -28,42 +28,47 @@
         <path
             android:name="check"
             android:pathData="m20,200l100,90l180,-180l-35,-35l-145,145l-60,-60l-40,40z"
-            android:fill="#ffff00ff"
-            android:stroke="#FF00FF00"
-            android:strokeWidth="5" />
+            android:fill="?android:attr/colorControlActivated" />
     </group>
     <group>
         <path
             android:name="box1"
             android:pathData="m127,171l37,38l33,-31l-37,-40l-1,3l-2,0l-30,30z"
-            android:fill="#ffffffff"
-            android:stroke="#FF00FF00"
-            android:strokeWidth="5" />
+            android:fill="?android:attr/colorControlActivated"
+            android:stroke="?android:attr/colorControlActivated"
+            android:strokeLineCap="round"
+            android:strokeLineJoin="round" />
     </group>
     <group>
         <path
             android:name="box2"
             android:pathData="m127,171l37,38l33,-31l-37,-40l-1,3l-2,0l-30,30z"
-            android:fill="#ff000000"
             android:rotation="46.757"
             android:pivotX="162"
             android:pivotY="173.5"
-            android:stroke="#FF00FF00"
-            android:strokeWidth="5" />
+            android:fill="?attr/android:colorControlNormal"
+            android:stroke="?attr/android:colorControlNormal"
+            android:strokeWidth="3"
+            android:strokeLineCap="round"
+            android:strokeLineJoin="round" />
     </group>
     <group>
         <path
             android:name="box3"
             android:pathData="m187,147l-1,55l-49,-1l2,-53l48,0z"
-            android:stroke="#FF000000"
-            android:strokeWidth="4" />
+            android:stroke="?attr/android:colorControlNormal"
+            android:strokeWidth="10"
+            android:strokeLineCap="round"
+            android:strokeLineJoin="round" />
     </group>
     <group>
         <path
             android:name="box4"
             android:pathData="m248,74l0,164l-177,0l1,-165l173,-1l3,2z"
-            android:stroke="#FF000000"
-            android:strokeWidth="30" />
+            android:stroke="?attr/android:colorControlNormal"
+            android:strokeWidth="30"
+            android:strokeLineCap="round"
+            android:strokeLineJoin="round" />
     </group>
 
     <animation