From a95c8abb366d9c39450513335f550b56da13b30a Mon Sep 17 00:00:00 2001
From: ztenghui <ztenghui@google.com>
Date: Wed, 23 Jul 2014 09:47:50 -0700
Subject: [PATCH] API REVIEW: VectorDrawable

- Merge <size> and <viewport> attributes all in to top-level <vector> tag
- Indent attributes under <group> in java doc.
- Updata android:stroke to be android:strokeColor, likewise android:fill
- Instead of android:clipToPath, make this a different clip-path tag.
- Document units of the various attributes
- Add example code for defining a VectorDrawable resource

More than that:
= Refactor the code to better support clipPath as a sub-class.
= Update all the xml files to use the new attributes and clip-path tag.

TODO:
-- Remove clipToPath, since that should happen on build break Friday.

bug:16488254

Change-Id: I6db5680ef83cb26c8f064a60fc7d6e7142974b0f
---
 api/current.txt                               |   4 +-
 core/java/android/util/PathParser.java        |   3 +
 core/res/res/drawable-nodpi/platlogo.xml      |  15 +-
 core/res/res/drawable-nodpi/stat_sys_adb.xml  |  11 +-
 core/res/res/drawable/ic_audio_ring_notif.xml |  11 +-
 .../res/drawable/ic_audio_ring_notif_mute.xml |  11 +-
 .../drawable/ic_audio_ring_notif_vibrate.xml  |  11 +-
 core/res/res/drawable/ic_corp_badge.xml       |  21 +-
 core/res/res/drawable/ic_corp_icon_badge.xml  |  27 +-
 core/res/res/drawable/ic_lock_bugreport.xml   |  11 +-
 .../drawable/stat_notify_disabled_data.xml    |  17 +-
 .../vector_drawable_progress_bar_large.xml    |  14 +-
 .../vector_drawable_progress_bar_medium.xml   |  14 +-
 .../vector_drawable_progress_bar_small.xml    |  14 +-
 core/res/res/values/attrs.xml                 |  30 +-
 core/res/res/values/public.xml                |   4 +-
 .../drawable/AnimatedVectorDrawable.java      |  14 +-
 .../graphics/drawable/VectorDrawable.java     | 847 ++++++++++--------
 .../res/drawable/ic_backspace_24dp.xml        |  11 +-
 .../res/drawable/ic_account_circle.xml        |  11 +-
 .../drawable/ic_account_circle_qs_muted.xml   |  11 +-
 .../SystemUI/res/drawable/ic_chevron_left.xml |  11 +-
 .../SystemUI/res/drawable/ic_clear_all.xml    |  11 +-
 .../SystemUI/res/drawable/ic_lock_24dp.xml    |  11 +-
 .../res/drawable/ic_lock_open_24dp.xml        |  11 +-
 .../res/drawable/ic_lock_to_app_24dp.xml      |  11 +-
 .../SystemUI/res/drawable/ic_power_low.xml    |  11 +-
 .../SystemUI/res/drawable/ic_power_saver.xml  |  11 +-
 .../res/drawable/ic_qs_airplane_off.xml       |  11 +-
 .../res/drawable/ic_qs_airplane_on.xml        |  13 +-
 packages/SystemUI/res/drawable/ic_qs_back.xml |  11 +-
 .../drawable/ic_qs_bluetooth_connected.xml    |  11 +-
 .../drawable/ic_qs_bluetooth_connecting.xml   |  11 +-
 .../drawable/ic_qs_bluetooth_detail_empty.xml |  11 +-
 .../res/drawable/ic_qs_bluetooth_off.xml      |  11 +-
 .../res/drawable/ic_qs_bluetooth_on.xml       |  11 +-
 .../SystemUI/res/drawable/ic_qs_bugreport.xml |  11 +-
 .../SystemUI/res/drawable/ic_qs_cancel.xml    |  11 +-
 .../res/drawable/ic_qs_cast_detail_empty.xml  |  11 +-
 .../SystemUI/res/drawable/ic_qs_cast_off.xml  |  11 +-
 .../SystemUI/res/drawable/ic_qs_cast_on.xml   |  11 +-
 .../res/drawable/ic_qs_flashlight_off.xml     |  15 +-
 .../res/drawable/ic_qs_flashlight_on.xml      |  13 +-
 .../res/drawable/ic_qs_hotspot_off.xml        |  12 +-
 .../res/drawable/ic_qs_hotspot_on.xml         |  11 +-
 .../res/drawable/ic_qs_inversion_off.xml      |  11 +-
 .../res/drawable/ic_qs_inversion_on.xml       |  11 +-
 .../res/drawable/ic_qs_location_off.xml       |  13 +-
 .../res/drawable/ic_qs_location_on.xml        |  11 +-
 .../SystemUI/res/drawable/ic_qs_minus.xml     |  11 +-
 packages/SystemUI/res/drawable/ic_qs_plus.xml |  11 +-
 .../res/drawable/ic_qs_ringer_audible.xml     |  11 +-
 .../res/drawable/ic_qs_ringer_silent.xml      |  11 +-
 .../res/drawable/ic_qs_ringer_vibrate.xml     |  11 +-
 .../res/drawable/ic_qs_rotation_landscape.xml |  11 +-
 .../res/drawable/ic_qs_rotation_portrait.xml  |  11 +-
 .../res/drawable/ic_qs_rotation_unlocked.xml  |  15 +-
 .../res/drawable/ic_qs_wifi_detail_empty.xml  |  11 +-
 .../res/drawable/ic_ringer_audible.xml        |  11 +-
 .../res/drawable/ic_ringer_vibrate.xml        |  11 +-
 .../res/drawable/ic_settings_24dp.xml         |  11 +-
 .../res/drawable/qs_dual_tile_caret.xml       |  11 +-
 .../res/drawable/qs_subhead_caret.xml         |  11 +-
 .../res/drawable/recents_dismiss_dark.xml     |  12 +-
 .../res/drawable/recents_dismiss_light.xml    |  12 +-
 .../res/drawable/stat_sys_data_bluetooth.xml  |  11 +-
 .../stat_sys_data_bluetooth_connected.xml     |  11 +-
 .../SystemUI/res/drawable/stat_sys_no_sim.xml |  11 +-
 .../res/drawable/stat_sys_ringer_vibrate.xml  |  11 +-
 .../res/drawable/stat_sys_zen_important.xml   |  11 +-
 .../res/drawable/stat_sys_zen_none.xml        |  11 +-
 .../res/drawable/vector_drawable01.xml        |  14 +-
 .../res/drawable/vector_drawable02.xml        |  14 +-
 .../res/drawable/vector_drawable03.xml        |  19 +-
 .../res/drawable/vector_drawable04.xml        |  31 +-
 .../res/drawable/vector_drawable05.xml        |  13 +-
 .../res/drawable/vector_drawable06.xml        |  30 +-
 .../res/drawable/vector_drawable07.xml        |  11 +-
 .../res/drawable/vector_drawable08.xml        |  15 +-
 .../res/drawable/vector_drawable09.xml        |  12 +-
 .../res/drawable/vector_drawable10.xml        |  18 +-
 .../res/drawable/vector_drawable11.xml        |  16 +-
 .../res/drawable/vector_drawable12.xml        |  24 +-
 .../res/drawable/vector_drawable13.xml        |  18 +-
 .../res/drawable/vector_drawable14.xml        |  14 +-
 .../res/drawable/vector_drawable15.xml        |  14 +-
 .../res/drawable/vector_drawable16.xml        |  16 +-
 .../res/drawable/vector_drawable17.xml        |  14 +-
 .../res/drawable/vector_drawable18.xml        |  14 +-
 .../res/drawable/vector_drawable19.xml        |  14 +-
 .../res/drawable/vector_drawable20.xml        |  14 +-
 .../res/drawable/vector_drawable21.xml        |  16 +-
 .../res/drawable/vector_drawable22.xml        |  20 +-
 .../res/drawable/vector_drawable23.xml        |  24 +-
 .../res/drawable/vector_drawable24.xml        |  24 +-
 .../res/drawable/vector_drawable25.xml        |  24 +-
 .../res/drawable/vector_drawable_favorite.xml |  12 +-
 .../drawable/vector_drawable_grouping_1.xml   |  16 +-
 .../drawable/vector_drawable_progress_bar.xml |  14 +-
 .../res/drawable/vector_icon_create.xml       |  12 +-
 .../res/drawable/vector_icon_delete.xml       |  12 +-
 .../res/drawable/vector_icon_heart.xml        |  12 +-
 .../res/drawable/vector_icon_schedule.xml     |  10 +-
 .../res/drawable/vector_icon_settings.xml     |  12 +-
 .../res/drawable/vector_test01.xml            |  14 +-
 .../res/drawable/vector_test02.xml            |  14 +-
 106 files changed, 1009 insertions(+), 1241 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 38d4aef0a0ff8..864ed1903c509 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -564,9 +564,9 @@ package android {
     field public static final int fastScrollTextColor = 16843609; // 0x1010359
     field public static final int fastScrollThumbDrawable = 16843574; // 0x1010336
     field public static final int fastScrollTrackDrawable = 16843577; // 0x1010339
-    field public static final int fill = 16843807; // 0x101041f
     field public static final int fillAfter = 16843197; // 0x10101bd
     field public static final int fillBefore = 16843196; // 0x10101bc
+    field public static final int fillColor = 16843807; // 0x101041f
     field public static final int fillEnabled = 16843343; // 0x101024f
     field public static final int fillOpacity = 16843806; // 0x101041e
     field public static final int fillViewport = 16843130; // 0x101017a
@@ -1161,7 +1161,7 @@ package android {
     field public static final int streamType = 16843273; // 0x1010209
     field public static final int stretchColumns = 16843081; // 0x1010149
     field public static final int stretchMode = 16843030; // 0x1010116
-    field public static final int stroke = 16843809; // 0x1010421
+    field public static final int strokeColor = 16843809; // 0x1010421
     field public static final int strokeLineCap = 16843815; // 0x1010427
     field public static final int strokeLineJoin = 16843816; // 0x1010428
     field public static final int strokeOpacity = 16843810; // 0x1010422
diff --git a/core/java/android/util/PathParser.java b/core/java/android/util/PathParser.java
index c36421db9b06a..6820f7785ec20 100644
--- a/core/java/android/util/PathParser.java
+++ b/core/java/android/util/PathParser.java
@@ -74,6 +74,9 @@ public class PathParser {
      * @return a deep copy of the <code>source</code>.
      */
     public static PathDataNode[] deepCopyNodes(PathDataNode[] source) {
+        if (source == null) {
+            return null;
+        }
         PathDataNode[] copy = new PathParser.PathDataNode[source.length];
         for (int i = 0; i < source.length; i ++) {
             copy[i] = new PathDataNode(source[i]);
diff --git a/core/res/res/drawable-nodpi/platlogo.xml b/core/res/res/drawable-nodpi/platlogo.xml
index d1e2df3f94e1f..fb528301fe193 100644
--- a/core/res/res/drawable-nodpi/platlogo.xml
+++ b/core/res/res/drawable-nodpi/platlogo.xml
@@ -13,27 +13,28 @@
     limitations under the License.
 -->
 
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size android:width="400dp" android:height="400dp"/>
-
-    <viewport android:viewportHeight="25" android:viewportWidth="25" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="400dp"
+        android:height="400dp"
+        android:viewportHeight="25"
+        android:viewportWidth="25" >
 
     <path
         android:name="torso"
         android:pathData="m2,2 l21,0 l0,21 l-21,0 z"
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         />
 
     <path
         android:name="|"
         android:pathData="m4,4 l8,0 l0,17 l-8,0 z"
-        android:fill="#FF0000FF"
+        android:fillColor="#FF0000FF"
         />
 
     <path
         android:name="_"
         android:pathData="m5,14 l16,0 l0,6 l-16,0 z"
-        android:fill="#FFFF0000"
+        android:fillColor="#FFFF0000"
         />
 
 </vector>
diff --git a/core/res/res/drawable-nodpi/stat_sys_adb.xml b/core/res/res/drawable-nodpi/stat_sys_adb.xml
index 6b3be4a181adf..1fee2df3af4b1 100644
--- a/core/res/res/drawable-nodpi/stat_sys_adb.xml
+++ b/core/res/res/drawable-nodpi/stat_sys_adb.xml
@@ -13,10 +13,11 @@
     limitations under the License.
 -->
 
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size android:width="25dp" android:height="25dp"/>
-
-    <viewport android:viewportHeight="25" android:viewportWidth="25" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="25dp"
+        android:height="25dp"
+        android:viewportHeight="25"
+        android:viewportWidth="25" >
 
     <path
         android:name="L-card"
@@ -34,7 +35,7 @@
         M15,2 l3,0 l0,5 l5,0 l0,3 l-8,0
 
         z"
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         />
 
 
diff --git a/core/res/res/drawable/ic_audio_ring_notif.xml b/core/res/res/drawable/ic_audio_ring_notif.xml
index b52db5c332056..60a98abf7f91a 100644
--- a/core/res/res/drawable/ic_audio_ring_notif.xml
+++ b/core/res/res/drawable/ic_audio_ring_notif.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="32dp"
-        android:height="32dp"/>
-
-    <viewport
+        android:height="32dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"/>
+        android:viewportHeight="24.0">
 
     <path
-        android:fill="#8A000000"
+        android:fillColor="#8A000000"
         android:pathData="M11.5,22.0c1.1,0.0 2.0,-0.9 2.0,-2.0l-4.0,0.0C9.5,21.1 10.4,22.0 11.5,22.0zM18.0,16.0l0.0,-5.5c0.0,-3.1 -2.1,-5.6 -5.0,-6.3L13.0,3.5C13.0,2.7 12.3,2.0 11.5,2.0C10.7,2.0 10.0,2.7 10.0,3.5l0.0,0.7c-2.9,0.7 -5.0,3.2 -5.0,6.3L5.0,16.0l-2.0,2.0l0.0,1.0l17.0,0.0l0.0,-1.0L18.0,16.0z"/>
 </vector>
diff --git a/core/res/res/drawable/ic_audio_ring_notif_mute.xml b/core/res/res/drawable/ic_audio_ring_notif_mute.xml
index 8d7d6cbe0747e..17dfa7e72c568 100644
--- a/core/res/res/drawable/ic_audio_ring_notif_mute.xml
+++ b/core/res/res/drawable/ic_audio_ring_notif_mute.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="32dp"
-        android:height="32dp"/>
-
-    <viewport
+        android:height="32dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"/>
+        android:viewportHeight="24.0">
 
     <path
-        android:fill="#8A000000"
+        android:fillColor="#8A000000"
         android:pathData="M11.5,22.0c1.1,0.0 2.0,-0.9 2.0,-2.0l-4.0,0.0C9.5,21.1 10.4,22.0 11.5,22.0zM18.0,10.5c0.0,-3.1 -2.1,-5.6 -5.0,-6.3L13.0,3.5C13.0,2.7 12.3,2.0 11.5,2.0C10.7,2.0 10.0,2.7 10.0,3.5l0.0,0.7C9.5,4.3 9.0,4.5 8.6,4.7l9.4,9.4L18.0,10.5zM17.7,19.0l2.0,2.0l1.3,-1.3L4.3,3.0L3.0,4.3l2.9,2.9C5.3,8.2 5.0,9.3 5.0,10.5L5.0,16.0l-2.0,2.0l0.0,1.0L17.7,19.0z" />
 </vector>
diff --git a/core/res/res/drawable/ic_audio_ring_notif_vibrate.xml b/core/res/res/drawable/ic_audio_ring_notif_vibrate.xml
index 2f1d940eb1a20..2ed33eab48487 100644
--- a/core/res/res/drawable/ic_audio_ring_notif_vibrate.xml
+++ b/core/res/res/drawable/ic_audio_ring_notif_vibrate.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="32dp"
-        android:height="32dp"/>
-
-    <viewport
+        android:height="32dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"/>
+        android:viewportHeight="24.0">
 
     <path
-        android:fill="#8A000000"
+        android:fillColor="#8A000000"
         android:pathData="M0.0,15.0l2.0,0.0L2.0,9.0L0.0,9.0L0.0,15.0zM3.0,17.0l2.0,0.0L5.0,7.0L3.0,7.0L3.0,17.0zM22.0,9.0l0.0,6.0l2.0,0.0L24.0,9.0L22.0,9.0zM19.0,17.0l2.0,0.0L21.0,7.0l-2.0,0.0L19.0,17.0zM16.5,3.0l-9.0,0.0C6.7,3.0 6.0,3.7 6.0,4.5l0.0,15.0C6.0,20.3 6.7,21.0 7.5,21.0l9.0,0.0c0.8,0.0 1.5,-0.7 1.5,-1.5l0.0,-15.0C18.0,3.7 17.3,3.0 16.5,3.0zM16.0,19.0L8.0,19.0L8.0,5.0l8.0,0.0L16.0,19.0z"/>
 </vector>
diff --git a/core/res/res/drawable/ic_corp_badge.xml b/core/res/res/drawable/ic_corp_badge.xml
index 16c101b15c194..e185fc45e0b26 100644
--- a/core/res/res/drawable/ic_corp_badge.xml
+++ b/core/res/res/drawable/ic_corp_badge.xml
@@ -13,31 +13,28 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="20.0dp"
-        android:height="20.0dp"/>
-
-    <viewport
+        android:height="20.0dp"
         android:viewportWidth="20.0"
-        android:viewportHeight="20.0"/>
+        android:viewportHeight="20.0">
 
     <path
         android:pathData="M10.0,10.0m-10.0,0.0a10.0,10.0 0.0,1.0 1.0,20.0 0.0a10.0,10.0 0.0,1.0 1.0,-20.0 0.0"
-        android:fill="#FF5722"/>
+        android:fillColor="#FF5722"/>
     <path
         android:pathData="M11.139,12.149l-0.001,0.0L8.996,12.149l0.0,-0.571L4.738,11.578l-0.002,2.198c0.0,0.589 0.477,1.066 1.066,1.066l8.535,0.0c0.589,0.0 1.066,-0.477 1.066,-1.066l0.0,-2.198l-4.264,0.0L11.139,12.149z"
-        android:fill="#FFFFFF"/>
+        android:fillColor="#FFFFFF"/>
     <path
         android:pathData="M8.996,10.006l2.143,0.0l0.0,0.52l4.442,0.0L15.580999,7.909c0.0,-0.589 -0.477,-1.066 -1.066,-1.066l-1.877,0.0L7.544,6.843L5.606,6.843c-0.589,0.0 -1.061,0.477 -1.061,1.066l-0.003,2.617l4.453,0.0L8.996,10.006L8.996,10.006z"
-        android:fill="#FFFFFF"/>
+        android:fillColor="#FFFFFF"/>
     <path
         android:pathData="M3.367,3.456 h13.016 v13.016 h-13.016z"
-        android:fill="#00000000"/>
+        android:fillColor="#00000000"/>
     <path
         android:pathData="M7.368,5.263l5.263,0.0l0.0,1.053l-5.263,0.0z"
-        android:fill="#FFFFFF"/>
+        android:fillColor="#FFFFFF"/>
     <path
         android:pathData="M8.996,12.149l2.1419992,0.0 0.0010004044,0.0 0.0,-0.5699997 -2.1429996,0.0z"
-        android:fill="#00000000"/>
+        android:fillColor="#00000000"/>
 </vector>
diff --git a/core/res/res/drawable/ic_corp_icon_badge.xml b/core/res/res/drawable/ic_corp_icon_badge.xml
index c8e49e1d5fa56..d20c43133c56a 100644
--- a/core/res/res/drawable/ic_corp_icon_badge.xml
+++ b/core/res/res/drawable/ic_corp_icon_badge.xml
@@ -13,42 +13,39 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64.0dp"
-        android:height="64.0dp"/>
-
-    <viewport
+        android:height="64.0dp"
         android:viewportWidth="64.0"
-        android:viewportHeight="64.0"/>
+        android:viewportHeight="64.0">
 
     <path
-        android:fill="#FF000000"
+        android:fillColor="#FF000000"
         android:pathData="M49.062,50.0m-14.0,0.0a14.0,14.0 0.0,1.0 1.0,28.0 0.0a14.0,14.0 0.0,1.0 1.0,-28.0 0.0"
         android:fillOpacity="0.2"/>
     <path
-        android:fill="#FF000000"
+        android:fillColor="#FF000000"
         android:pathData="M49.0,49.5m-14.0,0.0a14.0,14.0 0.0,1.0 1.0,28.0 0.0a14.0,14.0 0.0,1.0 1.0,-28.0 0.0"
         android:fillOpacity="0.2"/>
     <path
         android:pathData="M49.0,49.0m-14.0,0.0a14.0,14.0 0.0,1.0 1.0,28.0 0.0a14.0,14.0 0.0,1.0 1.0,-28.0 0.0"
-        android:fill="#FF5722"/>
+        android:fillColor="#FF5722"/>
     <path
         android:pathData="M50.594,52.009l-3.0,0.0L47.594,51.0l-5.961,0.0l-0.003,3.289c0.0,0.826 0.668,1.494 1.494,1.494l11.948,0.0c0.826,0.0 1.494,-0.668 1.494,-1.494L56.566006,51.0l-5.972,0.0C50.594,51.0 50.594,52.009 50.594,52.009z"
-        android:fill="#FFFFFF"/>
+        android:fillColor="#FFFFFF"/>
     <path
         android:pathData="M47.594,49.009l3.0,0.0L50.594,50.0l6.22,0.0l0.0,-3.925c0.0,-0.826 -0.668,-1.494 -1.494,-1.494l-2.627,0.0l-7.131,-0.001l-2.713,0.0c-0.826,0.0 -1.486,0.668 -1.486,1.494L41.359,50.0l6.235,0.0L47.594,49.009z"
-        android:fill="#FFFFFF"/>
+        android:fillColor="#FFFFFF"/>
     <path
         android:pathData="M39.714,39.838 h18.221 v18.221 h-18.221z"
-        android:fill="#00000000"/>
+        android:fillColor="#00000000"/>
     <path
         android:pathData="M47.594,49.009 h3.0 v0.991 h-3.0z"
-        android:fill="#00000000"/>
+        android:fillColor="#00000000"/>
     <path
         android:pathData="M47.594,51.0 h3.0 v1.009 h-3.0z"
-        android:fill="#00000000"/>
+        android:fillColor="#00000000"/>
     <path
         android:pathData="M46.0,43.0l6.0,0.0l0.0,1.0l-6.0,0.0z"
-        android:fill="#FFFFFF"/>
+        android:fillColor="#FFFFFF"/>
 </vector>
diff --git a/core/res/res/drawable/ic_lock_bugreport.xml b/core/res/res/drawable/ic_lock_bugreport.xml
index b93a09a8e1ec1..8540eee20a20e 100644
--- a/core/res/res/drawable/ic_lock_bugreport.xml
+++ b/core/res/res/drawable/ic_lock_bugreport.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="32dp"
-        android:height="32dp"/>
-
-    <viewport
+        android:height="32dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"/>
+        android:viewportHeight="24.0">
 
     <path
-        android:fill="?attr/colorControlNormal"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M20.0,8.0l-2.8,0.0c-0.5,-0.8 -1.1,-1.5 -1.8,-2.0L17.0,4.4L15.6,3.0l-2.2,2.2C13.0,5.1 12.5,5.0 12.0,5.0s-1.0,0.1 -1.4,0.2L8.4,3.0L7.0,4.4L8.6,6.0C7.9,6.5 7.3,7.2 6.8,8.0L4.0,8.0l0.0,2.0l2.1,0.0C6.0,10.3 6.0,10.7 6.0,11.0l0.0,1.0L4.0,12.0l0.0,2.0l2.0,0.0l0.0,1.0c0.0,0.3 0.0,0.7 0.1,1.0L4.0,16.0l0.0,2.0l2.8,0.0c1.0,1.8 3.0,3.0 5.2,3.0s4.2,-1.2 5.2,-3.0L20.0,18.0l0.0,-2.0l-2.1,0.0c0.1,-0.3 0.1,-0.7 0.1,-1.0l0.0,-1.0l2.0,0.0l0.0,-2.0l-2.0,0.0l0.0,-1.0c0.0,-0.3 0.0,-0.7 -0.1,-1.0L20.0,10.0L20.0,8.0zM14.0,16.0l-4.0,0.0l0.0,-2.0l4.0,0.0L14.0,16.0zM14.0,12.0l-4.0,0.0l0.0,-2.0l4.0,0.0L14.0,12.0z"/>
 </vector>
diff --git a/core/res/res/drawable/stat_notify_disabled_data.xml b/core/res/res/drawable/stat_notify_disabled_data.xml
index d287a75b27f84..2f6ffaf12f504 100644
--- a/core/res/res/drawable/stat_notify_disabled_data.xml
+++ b/core/res/res/drawable/stat_notify_disabled_data.xml
@@ -13,25 +13,22 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
-        android:height="24dp"/>
-
-    <viewport
+        android:height="24dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M40.709,4.5l-6.604,7.337 0.0,16.601 6.604,6.604z"/>
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M32.305,13.838l-6.0629997,6.7370005 6.0629997,6.0629997z"/>
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M15.498,40.5l0.0,-7.9869995 -7.205,7.9869995z"/>
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M10.265,9.72l-2.5460005,2.545 9.971001,9.971 3.7139988,3.7140007 -4.105999,4.5619984 0.0,9.988001 6.6019993,0.0 0.0,-12.054001 1.8029995,1.8030014 0.0,10.250999 6.602001,0.0 0.0,-3.6479988 1.7999992,1.7999992 1.8479996,1.8479996 4.670002,4.669998 2.5459976,-2.5459976z"/>
 </vector>
diff --git a/core/res/res/drawable/vector_drawable_progress_bar_large.xml b/core/res/res/drawable/vector_drawable_progress_bar_large.xml
index 6e0840c20ea8a..3bf3cd70e328d 100644
--- a/core/res/res/drawable/vector_drawable_progress_bar_large.xml
+++ b/core/res/res/drawable/vector_drawable_progress_bar_large.xml
@@ -13,15 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="76dp"
-        android:width="76dp" />
-
-    <viewport
+        android:width="76dp"
         android:viewportHeight="48"
-        android:viewportWidth="48" />
+        android:viewportWidth="48" >
 
     <group
         android:name="root"
@@ -29,9 +25,9 @@
         android:translateY="24.0" >
         <path
             android:name="progressBar"
-            android:fill="#00000000"
+            android:fillColor="#00000000"
             android:pathData="M0, 0 m 0, -19 a 19,19 0 1,1 0,38 a 19,19 0 1,1 0,-38"
-            android:stroke="?attr/colorControlActivated"
+            android:strokeColor="?attr/colorControlActivated"
             android:strokeLineCap="round"
             android:strokeLineJoin="miter"
             android:strokeWidth="4"
diff --git a/core/res/res/drawable/vector_drawable_progress_bar_medium.xml b/core/res/res/drawable/vector_drawable_progress_bar_medium.xml
index 7f1231c47cc46..62f9225b85486 100644
--- a/core/res/res/drawable/vector_drawable_progress_bar_medium.xml
+++ b/core/res/res/drawable/vector_drawable_progress_bar_medium.xml
@@ -13,15 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="48dp"
-        android:width="48dp" />
-
-    <viewport
+        android:width="48dp"
         android:viewportHeight="48"
-        android:viewportWidth="48" />
+        android:viewportWidth="48" >
 
     <group
         android:name="root"
@@ -29,9 +25,9 @@
         android:translateY="24.0" >
         <path
             android:name="progressBar"
-            android:fill="#00000000"
+            android:fillColor="#00000000"
             android:pathData="M0, 0 m 0, -19 a 19,19 0 1,1 0,38 a 19,19 0 1,1 0,-38"
-            android:stroke="?attr/colorControlActivated"
+            android:strokeColor="?attr/colorControlActivated"
             android:strokeLineCap="round"
             android:strokeLineJoin="miter"
             android:strokeWidth="4"
diff --git a/core/res/res/drawable/vector_drawable_progress_bar_small.xml b/core/res/res/drawable/vector_drawable_progress_bar_small.xml
index 58ca101480978..1352cfcd3ef55 100644
--- a/core/res/res/drawable/vector_drawable_progress_bar_small.xml
+++ b/core/res/res/drawable/vector_drawable_progress_bar_small.xml
@@ -13,15 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="16dp"
-        android:width="16dp" />
-
-    <viewport
+        android:width="16dp"
         android:viewportHeight="48"
-        android:viewportWidth="48" />
+        android:viewportWidth="48" >
 
     <group
         android:name="root"
@@ -29,9 +25,9 @@
         android:translateY="24.0" >
         <path
             android:name="progressBar"
-            android:fill="#00000000"
+            android:fillColor="#00000000"
             android:pathData="M0, 0 m 0, -19 a 19,19 0 1,1 0,38 a 19,19 0 1,1 0,-38"
-            android:stroke="?attr/colorControlActivated"
+            android:strokeColor="?attr/colorControlActivated"
             android:strokeLineCap="round"
             android:strokeLineJoin="miter"
             android:strokeWidth="4"
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index fedea4e8aa4a6..da881be5a34a8 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -5116,24 +5116,16 @@
         <!-- Indicates if the drawable needs to be mirrored when its layout direction is
              RTL (right-to-left). -->
         <attr name="autoMirrored" />
-    </declare-styleable>
-
-    <!-- Define the virtual size of the drawing surface paths will draw to. -->
-    <declare-styleable name="VectorDrawableViewport">
+        <!-- The intrinsic width of the Vector Drawable. -->
+        <attr name="width" />
+        <!-- The intrinsic height of the Vector Drawable. -->
+        <attr name="height" />
         <!-- The width of the canvas the drawing is on. -->
         <attr name="viewportWidth" format="float"/>
         <!-- The height of the canvas the drawing is on. -->
         <attr name="viewportHeight" format="float"/>
     </declare-styleable>
 
-    <!-- Define the size of the drawable -->
-    <declare-styleable name="VectorDrawableSize">
-        <!-- Width of the Vector Drawable. -->
-        <attr name="width" />
-        <!-- Height of the Vector Drawable. -->
-        <attr name="height" />
-    </declare-styleable>
-
     <!-- Defines the group used in VectorDrawables. -->
     <declare-styleable name="VectorDrawableGroup">
         <!-- The Name of this group -->
@@ -5165,9 +5157,9 @@
         <!-- The opacity of a path stroke -->
         <attr name="strokeOpacity" format="float" />
         <!-- The color to stroke the path if not defined implies no stroke-->
-        <attr name="stroke" format="color" />
+        <attr name="strokeColor" format="color" />
         <!-- The color to fill the path if not defined implies no fill-->
-        <attr name="fill" format="color" />
+        <attr name="fillColor" format="color" />
         <!-- The level of opacity of the filled area of the path -->
         <attr name="fillOpacity" format="float" />
         <!-- The specification of the operations that define the path  -->
@@ -5178,7 +5170,7 @@
         <attr name="trimPathEnd" format="float" />
         <!-- Shift trim region (allows visible region to include the start and end) from 0 to 1  -->
         <attr name="trimPathOffset" format="float" />
-        <!-- Path will set the current clip path -->
+        <!-- TODO: Remove this. Path will set the current clip path -->
         <attr name="clipToPath" format="boolean" />
         <!-- sets the linecap for a stroked path -->
         <attr name="strokeLineCap" format="enum">
@@ -5196,6 +5188,14 @@
         <attr name="strokeMiterLimit" format="float"/>
     </declare-styleable>
 
+    <!-- Defines the clip path used in VectorDrawables. -->
+    <declare-styleable name="VectorDrawableClipPath">
+        <!-- The Name of this path -->
+        <attr name="name" />
+        <!-- The specification of the operations that define the path  -->
+        <attr name="pathData"/>
+    </declare-styleable>
+
     <!-- ========================== -->
     <!--   AnimatedVectorDrawable class   -->
     <!-- ========================== -->
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index a6e85e934ff8e..c5fccde0b4cc0 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2119,9 +2119,9 @@
   <public type="attr" name="viewportWidth" />
   <public type="attr" name="viewportHeight" />
   <public type="attr" name="fillOpacity" />
-  <public type="attr" name="fill" />
+  <public type="attr" name="fillColor" />
   <public type="attr" name="pathData" />
-  <public type="attr" name="stroke" />
+  <public type="attr" name="strokeColor" />
   <public type="attr" name="strokeOpacity" />
   <public type="attr" name="strokeWidth" />
   <public type="attr" name="trimPathStart" />
diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
index 11c25710d2e60..54683aa9268d2 100644
--- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
@@ -49,13 +49,11 @@ import java.util.ArrayList;
  * </p>
  * <li>Here is a simple VectorDrawable in this vectordrawable.xml file.
  * <pre>
- * &lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot; &gt;
- *     &lt;size
- *         android:height=&quot;64dp&quot;
- *         android:width=&quot;64dp&quot; /&gt;
- *     &lt;viewport
- *         android:viewportHeight=&quot;600&quot;
- *         android:viewportWidth=&quot;600&quot; /&gt;
+ * &lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;
+ *     android:height=&quot;64dp&quot;
+ *     android:width=&quot;64dp&quot;
+ *     android:viewportHeight=&quot;600&quot;
+ *     android:viewportWidth=&quot;600&quot; &gt;
  *     &lt;group
  *         android:name=&quot;rotationGroup&quot;
  *         android:pivotX=&quot;300.0&quot;
@@ -63,7 +61,7 @@ import java.util.ArrayList;
  *         android:rotation=&quot;45.0&quot; &gt;
  *         &lt;path
  *             android:name=&quot;v&quot;
- *             android:fill=&quot;#000000&quot;
+ *             android:fillColor=&quot;#000000&quot;
  *             android:pathData=&quot;M300,70 l 0,-70 70,70 0,0 -70,70z&quot; /&gt;
  *     &lt;/group&gt;
  * &lt;/vector&gt;
diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java
index f32fa1f6fd704..f41b11a6ef40e 100644
--- a/graphics/java/android/graphics/drawable/VectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/VectorDrawable.java
@@ -54,76 +54,130 @@ import java.util.Stack;
  * <p/>
  * The vector drawable has the following elements:
  * <p/>
- * <dl>
  * <dt><code>&lt;vector></code></dt>
- * <dd>Used to defined a vector drawable</dd>
- * <dt><code>&lt;size></code></dt>
- * <dd>Used to defined the intrinsic Width Height size of the drawable using
- * <code>android:width</code> and <code>android:height</code></dd>
- * <dt><code>&lt;viewport></code></dt>
- * <dd>Used to defined the size of the virtual canvas the paths are drawn on.
- * The size is defined using the attributes <code>android:viewportHeight</code>
- * <code>android:viewportWidth</code></dd>
+ * <dl>
+ * <dd>Used to defined a vector drawable
+ * <dl>
+ * <dt><code>android:width</code></dt>
+ * <dd>Used to defined the intrinsic width of the drawable.
+ * This support all the dimension units, normally specified with dp.</dd>
+ * <dt><code>android:height</code></dt>
+ * <dd>Used to defined the intrinsic height the drawable.
+ * This support all the dimension units, normally specified with dp.</dd>
+ * <dt><code>android:viewportWidth</code></dt>
+ * <dd>Used to defined the width of the viewport space. Viewport is basically
+ * the virtual canvas where the paths are drawn on.</dd>
+ * <dt><code>android:viewportHeight</code></dt>
+ * <dd>Used to defined the height of the viewport space. Viewport is basically
+ * the virtual canvas where the paths are drawn on.</dd>
+ * <dt><code>android:tint</code></dt>
+ * <dd>The color to apply to the drawable as a tint. By default, no tint is applied.</dd>
+ * <dt><code>android:tintMode</code></dt>
+ * <dd>The Porter-Duff blending mode for the tint color. The default value is src_in.</dd>
+ * <dt><code>android:autoMirrored</code></dt>
+ * <dd>Indicates if the drawable needs to be mirrored when its layout direction is
+ * RTL (right-to-left).</dd>
+ * </dl></dd>
+ * </dl>
+ *
+ * <dl>
  * <dt><code>&lt;group></code></dt>
  * <dd>Defines a group of paths or subgroups, plus transformation information.
  * The transformations are defined in the same coordinates as the viewport.
- * And the transformations are applied in the order of scale, rotate then translate. </dd>
- * <dt><code>android:rotation</code>
- * <dd>The degrees of rotation of the group.</dd></dt>
- * <dt><code>android:pivotX</code>
- * <dd>The X coordinate of the pivot for the scale and rotation of the group</dd></dt>
- * <dt><code>android:pivotY</code>
- * <dd>The Y coordinate of the pivot for the scale and rotation of the group</dd></dt>
- * <dt><code>android:scaleX</code>
- * <dd>The amount of scale on the X Coordinate</dd></dt>
- * <dt><code>android:scaleY</code>
- * <dd>The amount of scale on the Y coordinate</dd></dt>
- * <dt><code>android:translateX</code>
- * <dd>The amount of translation on the X coordinate</dd></dt>
- * <dt><code>android:translateY</code>
- * <dd>The amount of translation on the Y coordinate</dd></dt>
+ * And the transformations are applied in the order of scale, rotate then translate.
+ * <dl>
+ * <dt><code>android:rotation</code></dt>
+ * <dd>The degrees of rotation of the group.</dd>
+ * <dt><code>android:pivotX</code></dt>
+ * <dd>The X coordinate of the pivot for the scale and rotation of the group.
+ * This is defined in the viewport space.</dd>
+ * <dt><code>android:pivotY</code></dt>
+ * <dd>The Y coordinate of the pivot for the scale and rotation of the group.
+ * This is defined in the viewport space.</dd>
+ * <dt><code>android:scaleX</code></dt>
+ * <dd>The amount of scale on the X Coordinate.</dd>
+ * <dt><code>android:scaleY</code></dt>
+ * <dd>The amount of scale on the Y coordinate.</dd>
+ * <dt><code>android:translateX</code></dt>
+ * <dd>The amount of translation on the X coordinate.
+ * This is defined in the viewport space.</dd>
+ * <dt><code>android:translateY</code></dt>
+ * <dd>The amount of translation on the Y coordinate.
+ * This is defined in the viewport space.</dd>
+ * </dl></dd>
+ * </dl>
+ *
+ * <dl>
  * <dt><code>&lt;path></code></dt>
  * <dd>Defines paths to be drawn.
  * <dl>
- * <dt><code>android:name</code>
- * <dd>Defines the name of the path.</dd></dt>
- * <dt><code>android:pathData</code>
+ * <dt><code>android:name</code></dt>
+ * <dd>Defines the name of the path.</dd>
+ * <dt><code>android:pathData</code></dt>
  * <dd>Defines path string. This is using exactly same format as "d" attribute
- * in the SVG's path data</dd></dt>
- * <dt><code>android:fill</code>
- * <dd>Defines the color to fill the path (none if not present).</dd></dt>
- * <dt><code>android:stroke</code>
+ * in the SVG's path data. This is defined in the viewport space.</dd>
+ * <dt><code>android:fillColor</code></dt>
+ * <dd>Defines the color to fill the path (none if not present).</dd>
+ * <dt><code>android:strokeColor</code></dt>
  * <dd>Defines the color to draw the path outline (none if not present).</dd>
- * </dt>
- * <dt><code>android:strokeWidth</code>
- * <dd>The width a path stroke</dd></dt>
- * <dt><code>android:strokeOpacity</code>
- * <dd>The opacity of a path stroke</dd></dt>
- * <dt><code>android:fillOpacity</code>
- * <dd>The opacity to fill the path with</dd></dt>
- * <dt><code>android:trimPathStart</code>
- * <dd>The fraction of the path to trim from the start from 0 to 1</dd></dt>
- * <dt><code>android:trimPathEnd</code>
- * <dd>The fraction of the path to trim from the end from 0 to 1</dd></dt>
- * <dt><code>android:trimPathOffset</code>
- * <dd>Shift trim region (allows showed region to include the start and end)
- * from 0 to 1</dd></dt>
- * <dt><code>android:clipToPath</code>
- * <dd>Path will set the clip path</dd></dt>
- * <dt><code>android:strokeLineCap</code>
- * <dd>Sets the linecap for a stroked path: butt, round, square</dd></dt>
- * <dt><code>android:strokeLineJoin</code>
- * <dd>Sets the lineJoin for a stroked path: miter,round,bevel</dd></dt>
- * <dt><code>android:strokeMiterLimit</code>
- * <dd>Sets the Miter limit for a stroked path</dd></dt>
+ * <dt><code>android:strokeWidth</code></dt>
+ * <dd>The width a path stroke.</dd>
+ * <dt><code>android:strokeOpacity</code></dt>
+ * <dd>The opacity of a path stroke.</dd>
+ * <dt><code>android:fillOpacity</code></dt>
+ * <dd>The opacity to fill the path with.</dd>
+ * <dt><code>android:trimPathStart</code></dt>
+ * <dd>The fraction of the path to trim from the start, in the range from 0 to 1.</dd>
+ * <dt><code>android:trimPathEnd</code></dt>
+ * <dd>The fraction of the path to trim from the end, in the range from 0 to 1.</dd>
+ * <dt><code>android:trimPathOffset</code></dt>
+ * <dd>Shift trim region (allows showed region to include the start and end), in the range
+ * from 0 to 1.</dd>
+ * <dt><code>android:strokeLineCap</code></dt>
+ * <dd>Sets the linecap for a stroked path: butt, round, square.</dd>
+ * <dt><code>android:strokeLineJoin</code></dt>
+ * <dd>Sets the lineJoin for a stroked path: miter,round,bevel.</dd>
+ * <dt><code>android:strokeMiterLimit</code></dt>
+ * <dd>Sets the Miter limit for a stroked path.</dd>
+ * </dl></dd>
  * </dl>
- * </dd>
+ *
+ * <dl>
+ * <dt><code>&lt;clip-path></code></dt>
+ * <dd>Defines path to be the current clip.
+ * <dl>
+ * <dt><code>android:name</code></dt>
+ * <dd>Defines the name of the clip path.</dd>
+ * <dt><code>android:pathData</code></dt>
+ * <dd>Defines clip path string. This is using exactly same format as "d" attribute
+ * in the SVG's path data.</dd>
+ * </dl></dd>
+ * </dl>
+ * <li>Here is a simple VectorDrawable in this vectordrawable.xml file.
+ * <pre>
+ * &lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;
+ *     android:height=&quot;64dp&quot;
+ *     android:width=&quot;64dp&quot;
+ *     android:viewportHeight=&quot;600&quot;
+ *     android:viewportWidth=&quot;600&quot; &gt;
+ *     &lt;group
+ *         android:name=&quot;rotationGroup&quot;
+ *         android:pivotX=&quot;300.0&quot;
+ *         android:pivotY=&quot;300.0&quot;
+ *         android:rotation=&quot;45.0&quot; &gt;
+ *         &lt;path
+ *             android:name=&quot;v&quot;
+ *             android:fillColor=&quot;#000000&quot;
+ *             android:pathData=&quot;M300,70 l 0,-70 70,70 0,0 -70,70z&quot; /&gt;
+ *     &lt;/group&gt;
+ * &lt;/vector&gt;
+ * </pre></li>
  */
+
 public class VectorDrawable extends Drawable {
     private static final String LOGTAG = VectorDrawable.class.getSimpleName();
 
-    private static final String SHAPE_SIZE = "size";
-    private static final String SHAPE_VIEWPORT = "viewport";
+    private static final String SHAPE_CLIP_PATH = "clip-path";
     private static final String SHAPE_GROUP = "group";
     private static final String SHAPE_PATH = "path";
     private static final String SHAPE_VECTOR = "vector";
@@ -337,20 +391,24 @@ public class VectorDrawable extends Drawable {
     @Override
     public void inflate(Resources res, XmlPullParser parser, AttributeSet attrs, Theme theme)
             throws XmlPullParserException, IOException {
-        final TypedArray a = obtainAttributes(res, theme, attrs, R.styleable.VectorDrawable);
+        final VectorDrawableState state = mVectorState;
+        final VPathRenderer pathRenderer = new VPathRenderer();
+        state.mVPathRenderer = pathRenderer;
+
+        TypedArray a = obtainAttributes(res, theme, attrs, R.styleable.VectorDrawable);
         updateStateFromTypedArray(a);
         a.recycle();
 
-        final VectorDrawableState state = mVectorState;
-        mVectorState.mCacheDirty = true;
+        state.mCacheDirty = true;
         inflateInternal(res, parser, attrs, theme);
 
         mTintFilter = updateTintFilter(mTintFilter, state.mTint, state.mTintMode);
         state.mVPathRenderer.setColorFilter(mTintFilter);
     }
 
-    private void updateStateFromTypedArray(TypedArray a) {
+    private void updateStateFromTypedArray(TypedArray a) throws XmlPullParserException {
         final VectorDrawableState state = mVectorState;
+        final VPathRenderer pathRenderer = state.mVPathRenderer;
 
         // Account for any configuration changes.
         state.mChangingConfigurations |= a.getChangingConfigurations();
@@ -370,16 +428,38 @@ public class VectorDrawable extends Drawable {
 
         state.mAutoMirrored = a.getBoolean(
                 R.styleable.VectorDrawable_autoMirrored, state.mAutoMirrored);
+
+        pathRenderer.mViewportWidth = a.getFloat(
+                R.styleable.VectorDrawable_viewportWidth, pathRenderer.mViewportWidth);
+        pathRenderer.mViewportHeight = a.getFloat(
+                R.styleable.VectorDrawable_viewportHeight, pathRenderer.mViewportHeight);
+
+        if (pathRenderer.mViewportWidth <= 0) {
+            throw new XmlPullParserException(a.getPositionDescription() +
+                    "<viewport> tag requires viewportWidth > 0");
+        } else if (pathRenderer.mViewportHeight <= 0) {
+            throw new XmlPullParserException(a.getPositionDescription() +
+                    "<viewport> tag requires viewportHeight > 0");
+        }
+
+        pathRenderer.mBaseWidth = a.getDimension(
+                R.styleable.VectorDrawable_width, pathRenderer.mBaseWidth);
+        pathRenderer.mBaseHeight = a.getDimension(
+                R.styleable.VectorDrawable_height, pathRenderer.mBaseHeight);
+
+        if (pathRenderer.mBaseWidth <= 0) {
+            throw new XmlPullParserException(a.getPositionDescription() +
+                    "<size> tag requires width > 0");
+        } else if (pathRenderer.mBaseHeight <= 0) {
+            throw new XmlPullParserException(a.getPositionDescription() +
+                    "<size> tag requires height > 0");
+        }
     }
 
     private void inflateInternal(Resources res, XmlPullParser parser, AttributeSet attrs,
             Theme theme) throws XmlPullParserException, IOException {
         final VectorDrawableState state = mVectorState;
-        final VPathRenderer pathRenderer = new VPathRenderer();
-        state.mVPathRenderer = pathRenderer;
-
-        boolean noSizeTag = true;
-        boolean noViewportTag = true;
+        final VPathRenderer pathRenderer = state.mVPathRenderer;
         boolean noPathTag = true;
 
         // Use a stack to help to build the group tree.
@@ -394,7 +474,7 @@ public class VectorDrawable extends Drawable {
                 final VGroup currentGroup = groupStack.peek();
 
                 if (SHAPE_PATH.equals(tagName)) {
-                    final VPath path = new VPath();
+                    final VFullPath path = new VFullPath();
                     path.inflate(res, attrs, theme);
                     currentGroup.mChildren.add(path);
                     if (path.getPathName() != null) {
@@ -402,14 +482,14 @@ public class VectorDrawable extends Drawable {
                     }
                     noPathTag = false;
                     state.mChangingConfigurations |= path.mChangingConfigurations;
-                } else if (SHAPE_SIZE.equals(tagName)) {
-                    pathRenderer.parseSize(res, attrs);
-                    noSizeTag = false;
-                    state.mChangingConfigurations |= pathRenderer.mChangingConfigurations;
-                } else if (SHAPE_VIEWPORT.equals(tagName)) {
-                    pathRenderer.parseViewport(res, attrs);
-                    noViewportTag = false;
-                    state.mChangingConfigurations |= pathRenderer.mChangingConfigurations;
+                } else if (SHAPE_CLIP_PATH.equals(tagName)) {
+                    final VClipPath path = new VClipPath();
+                    path.inflate(res, attrs, theme);
+                    currentGroup.mChildren.add(path);
+                    if (path.getPathName() != null) {
+                        pathRenderer.mVGTargetsMap.put(path.getPathName(), path);
+                    }
+                    state.mChangingConfigurations |= path.mChangingConfigurations;
                 } else if (SHAPE_GROUP.equals(tagName)) {
                     VGroup newChildGroup = new VGroup();
                     newChildGroup.inflate(res, attrs, theme);
@@ -435,26 +515,13 @@ public class VectorDrawable extends Drawable {
             printGroupTree(pathRenderer.mRootGroup, 0);
         }
 
-        if (noSizeTag || noViewportTag || noPathTag) {
+        if (noPathTag) {
             final StringBuffer tag = new StringBuffer();
 
-            if (noSizeTag) {
-                tag.append(SHAPE_SIZE);
-            }
-
-            if (noViewportTag) {
-                if (tag.length() > 0) {
-                    tag.append(" & ");
-                }
-                tag.append(SHAPE_SIZE);
-            }
-
-            if (noPathTag) {
-                if (tag.length() > 0) {
-                    tag.append(" or ");
-                }
-                tag.append(SHAPE_PATH);
+            if (tag.length() > 0) {
+                tag.append(" or ");
             }
+            tag.append(SHAPE_PATH);
 
             throw new XmlPullParserException("no " + tag + " defined");
         }
@@ -611,10 +678,10 @@ public class VectorDrawable extends Drawable {
         // Variables below need to be copied (deep copy if applicable) for mutation.
         private int mChangingConfigurations;
         private final VGroup mRootGroup;
-        private float mBaseWidth = 0;
-        private float mBaseHeight = 0;
-        private float mViewportWidth = 0;
-        private float mViewportHeight = 0;
+        float mBaseWidth = 0;
+        float mBaseHeight = 0;
+        float mViewportWidth = 0;
+        float mViewportHeight = 0;
         private int mRootAlpha = 0xFF;
 
         final ArrayMap<String, Object> mVGTargetsMap = new ArrayMap<String, Object>();
@@ -736,7 +803,8 @@ public class VectorDrawable extends Drawable {
 
         public void draw(Canvas canvas, int w, int h) {
             // Travese the tree in pre-order to draw.
-            drawGroupTree(mRootGroup, IDENTITY_MATRIX, ((float) mRootAlpha) / 0xFF, canvas, w, h);
+            drawGroupTree(mRootGroup, IDENTITY_MATRIX, ((float) mRootAlpha) / 0xFF,
+                    canvas, w, h);
         }
 
         private void drawPath(VGroup vGroup, VPath vPath, float stackedAlpha,
@@ -751,47 +819,48 @@ public class VectorDrawable extends Drawable {
             vPath.toPath(mPath);
             final Path path = mPath;
 
-            if (vPath.mTrimPathStart != 0.0f || vPath.mTrimPathEnd != 1.0f) {
-                float start = (vPath.mTrimPathStart + vPath.mTrimPathOffset) % 1.0f;
-                float end = (vPath.mTrimPathEnd + vPath.mTrimPathOffset) % 1.0f;
-
-                if (mPathMeasure == null) {
-                    mPathMeasure = new PathMeasure();
-                }
-                mPathMeasure.setPath(mPath, false);
-
-                float len = mPathMeasure.getLength();
-                start = start * len;
-                end = end * len;
-                path.reset();
-                if (start > end) {
-                    mPathMeasure.getSegment(start, len, path, true);
-                    mPathMeasure.getSegment(0f, end, path, true);
-                } else {
-                    mPathMeasure.getSegment(start, end, path, true);
-                }
-                path.rLineTo(0, 0); // fix bug in measure
-            }
-
             mRenderPath.reset();
 
-            mRenderPath.addPath(path, mFinalPathMatrix);
-
-            if (vPath.mClip) {
+            if (vPath.isClipPath()) {
+                mRenderPath.addPath(path, mFinalPathMatrix);
                 canvas.clipPath(mRenderPath, Region.Op.REPLACE);
             } else {
-                if (vPath.mFillColor != 0) {
+                VFullPath fullPath = (VFullPath) vPath;
+                if (fullPath.mTrimPathStart != 0.0f || fullPath.mTrimPathEnd != 1.0f) {
+                    float start = (fullPath.mTrimPathStart + fullPath.mTrimPathOffset) % 1.0f;
+                    float end = (fullPath.mTrimPathEnd + fullPath.mTrimPathOffset) % 1.0f;
+
+                    if (mPathMeasure == null) {
+                        mPathMeasure = new PathMeasure();
+                    }
+                    mPathMeasure.setPath(mPath, false);
+
+                    float len = mPathMeasure.getLength();
+                    start = start * len;
+                    end = end * len;
+                    path.reset();
+                    if (start > end) {
+                        mPathMeasure.getSegment(start, len, path, true);
+                        mPathMeasure.getSegment(0f, end, path, true);
+                    } else {
+                        mPathMeasure.getSegment(start, end, path, true);
+                    }
+                    path.rLineTo(0, 0); // fix bug in measure
+                }
+                mRenderPath.addPath(path, mFinalPathMatrix);
+
+                if (fullPath.mFillColor != 0) {
                     if (mFillPaint == null) {
                         mFillPaint = new Paint();
                         mFillPaint.setColorFilter(mColorFilter);
                         mFillPaint.setStyle(Paint.Style.FILL);
                         mFillPaint.setAntiAlias(true);
                     }
-                    mFillPaint.setColor(applyAlpha(vPath.mFillColor, stackedAlpha));
+                    mFillPaint.setColor(applyAlpha(fullPath.mFillColor, stackedAlpha));
                     canvas.drawPath(mRenderPath, mFillPaint);
                 }
 
-                if (vPath.mStrokeColor != 0) {
+                if (fullPath.mStrokeColor != 0) {
                     if (mStrokePaint == null) {
                         mStrokePaint = new Paint();
                         mStrokePaint.setColorFilter(mColorFilter);
@@ -800,70 +869,25 @@ public class VectorDrawable extends Drawable {
                     }
 
                     final Paint strokePaint = mStrokePaint;
-                    if (vPath.mStrokeLineJoin != null) {
-                        strokePaint.setStrokeJoin(vPath.mStrokeLineJoin);
+                    if (fullPath.mStrokeLineJoin != null) {
+                        strokePaint.setStrokeJoin(fullPath.mStrokeLineJoin);
                     }
 
-                    if (vPath.mStrokeLineCap != null) {
-                        strokePaint.setStrokeCap(vPath.mStrokeLineCap);
+                    if (fullPath.mStrokeLineCap != null) {
+                        strokePaint.setStrokeCap(fullPath.mStrokeLineCap);
                     }
 
-                    strokePaint.setStrokeMiter(vPath.mStrokeMiterlimit * minScale);
+                    strokePaint.setStrokeMiter(fullPath.mStrokeMiterlimit * minScale);
 
-                    strokePaint.setColor(applyAlpha(vPath.mStrokeColor, stackedAlpha));
-                    strokePaint.setStrokeWidth(vPath.mStrokeWidth * minScale);
+                    strokePaint.setColor(applyAlpha(fullPath.mStrokeColor, stackedAlpha));
+                    strokePaint.setStrokeWidth(fullPath.mStrokeWidth * minScale);
                     canvas.drawPath(mRenderPath, strokePaint);
                 }
             }
         }
-
-        private void parseViewport(Resources r, AttributeSet attrs)
-                throws XmlPullParserException {
-            final TypedArray a = r.obtainAttributes(attrs, R.styleable.VectorDrawableViewport);
-
-            // Account for any configuration changes.
-            mChangingConfigurations |= a.getChangingConfigurations();
-
-            mViewportWidth = a.getFloat(
-                    R.styleable.VectorDrawableViewport_viewportWidth, mViewportWidth);
-            mViewportHeight = a.getFloat(
-                    R.styleable.VectorDrawableViewport_viewportHeight, mViewportHeight);
-
-            if (mViewportWidth <= 0) {
-                throw new XmlPullParserException(a.getPositionDescription() +
-                        "<viewport> tag requires viewportWidth > 0");
-            } else if (mViewportHeight <= 0) {
-                throw new XmlPullParserException(a.getPositionDescription() +
-                        "<viewport> tag requires viewportHeight > 0");
-            }
-
-            a.recycle();
-        }
-
-        private void parseSize(Resources r, AttributeSet attrs)
-                throws XmlPullParserException {
-            final TypedArray a = r.obtainAttributes(attrs, R.styleable.VectorDrawableSize);
-
-            // Account for any configuration changes.
-            mChangingConfigurations |= a.getChangingConfigurations();
-
-            mBaseWidth = a.getDimension(R.styleable.VectorDrawableSize_width, mBaseWidth);
-            mBaseHeight = a.getDimension(R.styleable.VectorDrawableSize_height, mBaseHeight);
-
-            if (mBaseWidth <= 0) {
-                throw new XmlPullParserException(a.getPositionDescription() +
-                        "<size> tag requires width > 0");
-            } else if (mBaseHeight <= 0) {
-                throw new XmlPullParserException(a.getPositionDescription() +
-                        "<size> tag requires height > 0");
-            }
-
-            a.recycle();
-        }
-
     }
 
-    static class VGroup {
+    private static class VGroup {
         // mStackedMatrix is only used temporarily when drawing, it combines all
         // the parents' local matrices with the current one.
         private final Matrix mStackedMatrix = new Matrix();
@@ -912,9 +936,15 @@ public class VectorDrawable extends Drawable {
                 if (copyChild instanceof VGroup) {
                     VGroup copyGroup = (VGroup) copyChild;
                     mChildren.add(new VGroup(copyGroup, targetsMap));
-                } else if (copyChild instanceof VPath) {
-                    VPath copyPath = (VPath) copyChild;
-                    VPath newPath = new VPath(copyPath);
+                } else {
+                    VPath newPath = null;
+                    if (copyChild instanceof VFullPath) {
+                        newPath = new VFullPath((VFullPath) copyChild);
+                    } else if (copyChild instanceof VClipPath) {
+                        newPath = new VClipPath((VClipPath) copyChild);
+                    } else {
+                        throw new IllegalStateException("Unknown object in the tree!");
+                    }
                     mChildren.add(newPath);
                     if (newPath.mPathName != null) {
                         targetsMap.put(newPath.mPathName, newPath);
@@ -926,94 +956,6 @@ public class VectorDrawable extends Drawable {
         public VGroup() {
         }
 
-        /* Getter and Setter */
-        public float getRotation() {
-            return mRotate;
-        }
-
-        public void setRotation(float rotation) {
-            if (rotation != mRotate) {
-                mRotate = rotation;
-                updateLocalMatrix();
-            }
-        }
-
-        public float getPivotX() {
-            return mPivotX;
-        }
-
-        public void setPivotX(float pivotX) {
-            if (pivotX != mPivotX) {
-                mPivotX = pivotX;
-                updateLocalMatrix();
-            }
-        }
-
-        public float getPivotY() {
-            return mPivotY;
-        }
-
-        public void setPivotY(float pivotY) {
-            if (pivotY != mPivotY) {
-                mPivotY = pivotY;
-                updateLocalMatrix();
-            }
-        }
-
-        public float getScaleX() {
-            return mScaleX;
-        }
-
-        public void setScaleX(float scaleX) {
-            if (scaleX != mScaleX) {
-                mScaleX = scaleX;
-                updateLocalMatrix();
-            }
-        }
-
-        public float getScaleY() {
-            return mScaleY;
-        }
-
-        public void setScaleY(float scaleY) {
-            if (scaleY != mScaleY) {
-                mScaleY = scaleY;
-                updateLocalMatrix();
-            }
-        }
-
-        public float getTranslateX() {
-            return mTranslateX;
-        }
-
-        public void setTranslateX(float translateX) {
-            if (translateX != mTranslateX) {
-                mTranslateX = translateX;
-                updateLocalMatrix();
-            }
-        }
-
-        public float getTranslateY() {
-            return mTranslateY;
-        }
-
-        public void setTranslateY(float translateY) {
-            if (translateY != mTranslateY) {
-                mTranslateY = translateY;
-                updateLocalMatrix();
-            }
-        }
-
-        public float getAlpha() {
-            return mGroupAlpha;
-        }
-
-        public void setAlpha(float groupAlpha) {
-            if (groupAlpha != mGroupAlpha) {
-                mGroupAlpha = groupAlpha;
-            }
-        }
-
         public String getGroupName() {
             return mGroupName;
         }
@@ -1062,7 +1004,8 @@ public class VectorDrawable extends Drawable {
                 return;
             }
 
-            final TypedArray a = t.resolveAttributes(mThemeAttrs, R.styleable.VectorDrawablePath);
+            final TypedArray a = t.resolveAttributes(mThemeAttrs,
+                    R.styleable.VectorDrawableGroup);
             updateStateFromTypedArray(a);
             a.recycle();
         }
@@ -1076,9 +1019,207 @@ public class VectorDrawable extends Drawable {
             mLocalMatrix.postRotate(mRotate, 0, 0);
             mLocalMatrix.postTranslate(mTranslateX + mPivotX, mTranslateY + mPivotY);
         }
+
+        /* Setters and Getters, used by animator from AnimatedVectorDrawable. */
+        @SuppressWarnings("unused")
+        public float getRotation() {
+            return mRotate;
+        }
+
+        @SuppressWarnings("unused")
+        public void setRotation(float rotation) {
+            if (rotation != mRotate) {
+                mRotate = rotation;
+                updateLocalMatrix();
+            }
+        }
+
+        @SuppressWarnings("unused")
+        public float getPivotX() {
+            return mPivotX;
+        }
+
+        @SuppressWarnings("unused")
+        public void setPivotX(float pivotX) {
+            if (pivotX != mPivotX) {
+                mPivotX = pivotX;
+                updateLocalMatrix();
+            }
+        }
+
+        @SuppressWarnings("unused")
+        public float getPivotY() {
+            return mPivotY;
+        }
+
+        @SuppressWarnings("unused")
+        public void setPivotY(float pivotY) {
+            if (pivotY != mPivotY) {
+                mPivotY = pivotY;
+                updateLocalMatrix();
+            }
+        }
+
+        @SuppressWarnings("unused")
+        public float getScaleX() {
+            return mScaleX;
+        }
+
+        @SuppressWarnings("unused")
+        public void setScaleX(float scaleX) {
+            if (scaleX != mScaleX) {
+                mScaleX = scaleX;
+                updateLocalMatrix();
+            }
+        }
+
+        @SuppressWarnings("unused")
+        public float getScaleY() {
+            return mScaleY;
+        }
+
+        @SuppressWarnings("unused")
+        public void setScaleY(float scaleY) {
+            if (scaleY != mScaleY) {
+                mScaleY = scaleY;
+                updateLocalMatrix();
+            }
+        }
+
+        @SuppressWarnings("unused")
+        public float getTranslateX() {
+            return mTranslateX;
+        }
+
+        @SuppressWarnings("unused")
+        public void setTranslateX(float translateX) {
+            if (translateX != mTranslateX) {
+                mTranslateX = translateX;
+                updateLocalMatrix();
+            }
+        }
+
+        @SuppressWarnings("unused")
+        public float getTranslateY() {
+            return mTranslateY;
+        }
+
+        @SuppressWarnings("unused")
+        public void setTranslateY(float translateY) {
+            if (translateY != mTranslateY) {
+                mTranslateY = translateY;
+                updateLocalMatrix();
+            }
+        }
+
+        @SuppressWarnings("unused")
+        public float getAlpha() {
+            return mGroupAlpha;
+        }
+
+        @SuppressWarnings("unused")
+        public void setAlpha(float groupAlpha) {
+            if (groupAlpha != mGroupAlpha) {
+                mGroupAlpha = groupAlpha;
+            }
+        }
     }
 
+    /**
+     * Common Path information for clip path and normal path.
+     */
     private static class VPath {
+        protected PathParser.PathDataNode[] mNodes = null;
+        String mPathName;
+        int mChangingConfigurations;
+
+        public VPath() {
+            // Empty constructor.
+        }
+
+        public VPath(VPath copy) {
+            mPathName = copy.mPathName;
+            mChangingConfigurations = copy.mChangingConfigurations;
+            mNodes = PathParser.deepCopyNodes(copy.mNodes);
+        }
+
+        public void toPath(Path path) {
+            path.reset();
+            if (mNodes != null) {
+                PathParser.PathDataNode.nodesToPath(mNodes, path);
+            }
+        }
+
+        public String getPathName() {
+            return mPathName;
+        }
+
+        public boolean canApplyTheme() {
+            return false;
+        }
+
+        public void applyTheme(Theme t) {
+        }
+
+        public boolean isClipPath() {
+            return false;
+        }
+
+        /* Setters and Getters, used by animator from AnimatedVectorDrawable. */
+        @SuppressWarnings("unused")
+        public PathParser.PathDataNode[] getPathData() {
+            return mNodes;
+        }
+
+        @SuppressWarnings("unused")
+        public void setPathData(PathParser.PathDataNode[] nodes) {
+            if (!PathParser.canMorph(mNodes, nodes)) {
+                // This should not happen in the middle of animation.
+                mNodes = PathParser.deepCopyNodes(nodes);
+            } else {
+                PathParser.updateNodes(mNodes, nodes);
+            }
+        }
+    }
+
+    /**
+     * Clip path, which only has name and pathData.
+     */
+    private static class VClipPath extends VPath{
+        public VClipPath() {
+            // Empty constructor.
+        }
+
+        public VClipPath(VClipPath copy) {
+            super(copy);
+        }
+
+        public void inflate(Resources r, AttributeSet attrs, Theme theme) {
+            final TypedArray a = obtainAttributes(r, theme, attrs,
+                    R.styleable.VectorDrawableClipPath);
+            updateStateFromTypedArray(a);
+            a.recycle();
+        }
+
+        private void updateStateFromTypedArray(TypedArray a) {
+            // Account for any configuration changes.
+            mChangingConfigurations |= a.getChangingConfigurations();
+
+            mPathName = a.getString(R.styleable.VectorDrawableClipPath_name);
+            mNodes = PathParser.createNodesFromPathData(a.getString(
+                    R.styleable.VectorDrawableClipPath_pathData));
+        }
+
+        @Override
+        public boolean isClipPath() {
+            return true;
+        }
+    }
+
+    /**
+     * Normal path, which contains all the fill / paint information.
+     */
+    private static class VFullPath extends VPath {
         /////////////////////////////////////////////////////
         // Variables below need to be copied (deep copy if applicable) for mutation.
         private int[] mThemeAttrs;
@@ -1093,20 +1234,16 @@ public class VectorDrawable extends Drawable {
         float mTrimPathEnd = 1;
         float mTrimPathOffset = 0;
 
-        boolean mClip = false;
         Paint.Cap mStrokeLineCap = Paint.Cap.BUTT;
         Paint.Join mStrokeLineJoin = Paint.Join.MITER;
         float mStrokeMiterlimit = 4;
 
-        private PathParser.PathDataNode[] mNodes = null;
-        String mPathName;
-        private int mChangingConfigurations;
-
-        public VPath() {
+        public VFullPath() {
             // Empty constructor.
         }
 
-        public VPath(VPath copy) {
+        public VFullPath(VFullPath copy) {
+            super(copy);
             mThemeAttrs = copy.mThemeAttrs;
 
             mStrokeColor = copy.mStrokeColor;
@@ -1119,25 +1256,9 @@ public class VectorDrawable extends Drawable {
             mTrimPathEnd = copy.mTrimPathEnd;
             mTrimPathOffset = copy.mTrimPathOffset;
 
-            mClip = copy.mClip;
             mStrokeLineCap = copy.mStrokeLineCap;
             mStrokeLineJoin = copy.mStrokeLineJoin;
             mStrokeMiterlimit = copy.mStrokeMiterlimit;
-
-            mNodes = PathParser.deepCopyNodes(copy.mNodes);
-            mPathName = copy.mPathName;
-            mChangingConfigurations = copy.mChangingConfigurations;
-        }
-
-        public void toPath(Path path) {
-            path.reset();
-            if (mNodes != null) {
-                PathParser.PathDataNode.nodesToPath(mNodes, path);
-            }
-        }
-
-        public String getPathName() {
-            return mPathName;
         }
 
         private Paint.Cap getStrokeLineCap(int id, Paint.Cap defValue) {
@@ -1166,22 +1287,78 @@ public class VectorDrawable extends Drawable {
             }
         }
 
-        /* Setters and Getters, mostly used by animator from AnimatedVectorDrawable. */
-        @SuppressWarnings("unused")
-        public PathParser.PathDataNode[] getPathData() {
-            return mNodes;
+        @Override
+        public boolean canApplyTheme() {
+            return mThemeAttrs != null;
         }
 
-        @SuppressWarnings("unused")
-        public void setPathData(PathParser.PathDataNode[] nodes) {
-            if (!PathParser.canMorph(mNodes, nodes)) {
-                // This should not happen in the middle of animation.
-                mNodes = PathParser.deepCopyNodes(nodes);
-            } else {
-                PathParser.updateNodes(mNodes, nodes);
+        public void inflate(Resources r, AttributeSet attrs, Theme theme) {
+            final TypedArray a = obtainAttributes(r, theme, attrs,
+                    R.styleable.VectorDrawablePath);
+            updateStateFromTypedArray(a);
+            a.recycle();
+        }
+
+        private void updateStateFromTypedArray(TypedArray a) {
+            // Account for any configuration changes.
+            mChangingConfigurations |= a.getChangingConfigurations();
+
+            // Extract the theme attributes, if any.
+            mThemeAttrs = a.extractThemeAttrs();
+
+            mPathName = a.getString(R.styleable.VectorDrawablePath_name);
+            mNodes = PathParser.createNodesFromPathData(a.getString(
+                    R.styleable.VectorDrawablePath_pathData));
+
+            mFillColor = a.getColor(R.styleable.VectorDrawablePath_fillColor,
+                    mFillColor);
+            mFillOpacity = a.getFloat(R.styleable.VectorDrawablePath_fillOpacity,
+                    mFillOpacity);
+            mStrokeLineCap = getStrokeLineCap(a.getInt(
+                    R.styleable.VectorDrawablePath_strokeLineCap, -1), mStrokeLineCap);
+            mStrokeLineJoin = getStrokeLineJoin(a.getInt(
+                    R.styleable.VectorDrawablePath_strokeLineJoin, -1), mStrokeLineJoin);
+            mStrokeMiterlimit = a.getFloat(
+                    R.styleable.VectorDrawablePath_strokeMiterLimit, mStrokeMiterlimit);
+            mStrokeColor = a.getColor(R.styleable.VectorDrawablePath_strokeColor,
+                    mStrokeColor);
+            mStrokeOpacity = a.getFloat(R.styleable.VectorDrawablePath_strokeOpacity,
+                    mStrokeOpacity);
+            mStrokeWidth = a.getFloat(R.styleable.VectorDrawablePath_strokeWidth,
+                    mStrokeWidth);
+            mTrimPathEnd = a.getFloat(R.styleable.VectorDrawablePath_trimPathEnd,
+                    mTrimPathEnd);
+            mTrimPathOffset = a.getFloat(
+                    R.styleable.VectorDrawablePath_trimPathOffset, mTrimPathOffset);
+            mTrimPathStart = a.getFloat(
+                    R.styleable.VectorDrawablePath_trimPathStart, mTrimPathStart);
+
+            updateColorAlphas();
+        }
+
+        @Override
+        public void applyTheme(Theme t) {
+            if (mThemeAttrs == null) {
+                return;
+            }
+
+            final TypedArray a = t.resolveAttributes(mThemeAttrs,
+                    R.styleable.VectorDrawablePath);
+            updateStateFromTypedArray(a);
+            a.recycle();
+        }
+
+        private void updateColorAlphas() {
+            if (!Float.isNaN(mFillOpacity)) {
+                mFillColor = applyAlpha(mFillColor, mFillOpacity);
+            }
+
+            if (!Float.isNaN(mStrokeOpacity)) {
+                mStrokeColor = applyAlpha(mStrokeColor, mStrokeOpacity);
             }
         }
 
+        /* Setters and Getters, used by animator from AnimatedVectorDrawable. */
         @SuppressWarnings("unused")
         int getStroke() {
             return mStrokeColor;
@@ -1261,69 +1438,5 @@ public class VectorDrawable extends Drawable {
         void setTrimPathOffset(float trimPathOffset) {
             mTrimPathOffset = trimPathOffset;
         }
-
-        public boolean canApplyTheme() {
-            return mThemeAttrs != null;
-        }
-
-        public void inflate(Resources r, AttributeSet attrs, Theme theme) {
-            final TypedArray a = obtainAttributes(r, theme, attrs, R.styleable.VectorDrawablePath);
-            updateStateFromTypedArray(a);
-            a.recycle();
-        }
-
-        private void updateStateFromTypedArray(TypedArray a) {
-            // Account for any configuration changes.
-            mChangingConfigurations |= a.getChangingConfigurations();
-
-            // Extract the theme attributes, if any.
-            mThemeAttrs = a.extractThemeAttrs();
-
-            mClip = a.getBoolean(R.styleable.VectorDrawablePath_clipToPath, mClip);
-
-            mPathName = a.getString(R.styleable.VectorDrawablePath_name);
-            mNodes = PathParser.createNodesFromPathData(a.getString(
-                    R.styleable.VectorDrawablePath_pathData));
-
-            mFillColor = a.getColor(R.styleable.VectorDrawablePath_fill, mFillColor);
-            mFillOpacity = a.getFloat(R.styleable.VectorDrawablePath_fillOpacity, mFillOpacity);
-            mStrokeLineCap = getStrokeLineCap(a.getInt(
-                    R.styleable.VectorDrawablePath_strokeLineCap, -1), mStrokeLineCap);
-            mStrokeLineJoin = getStrokeLineJoin(a.getInt(
-                    R.styleable.VectorDrawablePath_strokeLineJoin, -1), mStrokeLineJoin);
-            mStrokeMiterlimit = a.getFloat(
-                    R.styleable.VectorDrawablePath_strokeMiterLimit, mStrokeMiterlimit);
-            mStrokeColor = a.getColor(R.styleable.VectorDrawablePath_stroke, mStrokeColor);
-            mStrokeOpacity = a.getFloat(
-                    R.styleable.VectorDrawablePath_strokeOpacity, mStrokeOpacity);
-            mStrokeWidth = a.getFloat(R.styleable.VectorDrawablePath_strokeWidth, mStrokeWidth);
-            mTrimPathEnd = a.getFloat(R.styleable.VectorDrawablePath_trimPathEnd, mTrimPathEnd);
-            mTrimPathOffset = a.getFloat(
-                    R.styleable.VectorDrawablePath_trimPathOffset, mTrimPathOffset);
-            mTrimPathStart = a.getFloat(
-                    R.styleable.VectorDrawablePath_trimPathStart, mTrimPathStart);
-
-            updateColorAlphas();
-        }
-
-        public void applyTheme(Theme t) {
-            if (mThemeAttrs == null) {
-                return;
-            }
-
-            final TypedArray a = t.resolveAttributes(mThemeAttrs, R.styleable.VectorDrawablePath);
-            updateStateFromTypedArray(a);
-            a.recycle();
-        }
-
-        private void updateColorAlphas() {
-            if (!Float.isNaN(mFillOpacity)) {
-                mFillColor = applyAlpha(mFillColor, mFillOpacity);
-            }
-
-            if (!Float.isNaN(mStrokeOpacity)) {
-                mStrokeColor = applyAlpha(mStrokeColor, mStrokeOpacity);
-            }
-        }
     }
 }
diff --git a/packages/Keyguard/res/drawable/ic_backspace_24dp.xml b/packages/Keyguard/res/drawable/ic_backspace_24dp.xml
index 9e5016d991da7..47c8d14330c05 100644
--- a/packages/Keyguard/res/drawable/ic_backspace_24dp.xml
+++ b/packages/Keyguard/res/drawable/ic_backspace_24dp.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
-        android:height="24dp"/>
-
-    <viewport
+        android:height="24dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#ffffffff"
+        android:fillColor="#ffffffff"
         android:pathData="M44.0,6.0L14.0,6.0c-1.4,0.0 -2.5,0.7 -3.2,1.8L0.0,24.0l10.8,16.2c0.7,1.1 1.8,1.8 3.2,1.8l30.0,0.0c2.2,0.0 4.0,-1.8 4.0,-4.0L48.0,10.0C48.0,7.8 46.2,6.0 44.0,6.0zM38.0,31.2L35.2,34.0L28.0,26.8L20.8,34.0L18.0,31.2l7.2,-7.2L18.0,16.8l2.8,-2.8l7.2,7.2l7.2,-7.2l2.8,2.8L30.8,24.0L38.0,31.2z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_account_circle.xml b/packages/SystemUI/res/drawable/ic_account_circle.xml
index 4a4c1c1e2afc3..d8649e598e28e 100644
--- a/packages/SystemUI/res/drawable/ic_account_circle.xml
+++ b/packages/SystemUI/res/drawable/ic_account_circle.xml
@@ -13,14 +13,11 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
-        android:height="24dp"/>
-
-    <viewport
+        android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"/>
+        android:viewportHeight="24.0">
 
     <group
         android:scaleX="1.2"
@@ -28,7 +25,7 @@ Copyright (C) 2014 The Android Open Source Project
         android:pivotX="12.0"
         android:pivotY="12.0">
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M12.0,2.0C6.5,2.0 2.0,6.5 2.0,12.0s4.5,10.0 10.0,10.0c5.5,0.0 10.0,-4.5 10.0,-10.0S17.5,2.0 12.0,2.0zM12.0,5.0c1.7,0.0 3.0,1.3 3.0,3.0c0.0,1.7 -1.3,3.0 -3.0,3.0c-1.7,0.0 -3.0,-1.3 -3.0,-3.0C9.0,6.3 10.3,5.0 12.0,5.0zM12.0,19.2c-2.5,0.0 -4.7,-1.3 -6.0,-3.2c0.0,-2.0 4.0,-3.1 6.0,-3.1c2.0,0.0 6.0,1.1 6.0,3.1C16.7,17.9 14.5,19.2 12.0,19.2z"/>
     </group>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_account_circle_qs_muted.xml b/packages/SystemUI/res/drawable/ic_account_circle_qs_muted.xml
index afcddf1414d24..7b8b89f1814da 100644
--- a/packages/SystemUI/res/drawable/ic_account_circle_qs_muted.xml
+++ b/packages/SystemUI/res/drawable/ic_account_circle_qs_muted.xml
@@ -16,14 +16,11 @@
   ~ limitations under the License
   -->
 
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
-        android:height="24dp"/>
-
-    <viewport
+        android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"/>
+        android:viewportHeight="24.0">
 
     <group
         android:scaleX="1.2"
@@ -31,7 +28,7 @@
         android:pivotX="12.0"
         android:pivotY="12.0">
     <path
-        android:fill="@color/qs_user_detail_icon_muted"
+        android:fillColor="@color/qs_user_detail_icon_muted"
         android:pathData="M12.0,2.0C6.5,2.0 2.0,6.5 2.0,12.0s4.5,10.0 10.0,10.0c5.5,0.0 10.0,-4.5 10.0,-10.0S17.5,2.0 12.0,2.0zM12.0,5.0c1.7,0.0 3.0,1.3 3.0,3.0c0.0,1.7 -1.3,3.0 -3.0,3.0c-1.7,0.0 -3.0,-1.3 -3.0,-3.0C9.0,6.3 10.3,5.0 12.0,5.0zM12.0,19.2c-2.5,0.0 -4.7,-1.3 -6.0,-3.2c0.0,-2.0 4.0,-3.1 6.0,-3.1c2.0,0.0 6.0,1.1 6.0,3.1C16.7,17.9 14.5,19.2 12.0,19.2z"/>
     </group>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_chevron_left.xml b/packages/SystemUI/res/drawable/ic_chevron_left.xml
index 27c203439f173..379382b065041 100644
--- a/packages/SystemUI/res/drawable/ic_chevron_left.xml
+++ b/packages/SystemUI/res/drawable/ic_chevron_left.xml
@@ -13,16 +13,13 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
-        android:height="24dp"/>
-
-    <viewport
+        android:height="24dp"
         android:viewportWidth="36.0"
-        android:viewportHeight="36.0"/>
+        android:viewportHeight="36.0">
 
     <path
-        android:fill="#ffffffff"
+        android:fillColor="#ffffffff"
         android:pathData="M23.1,11.1l-2.1000004,-2.1000004 -9.0,9.0 9.0,9.0 2.1000004,-2.1000004 -6.8999996,-6.8999996z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_clear_all.xml b/packages/SystemUI/res/drawable/ic_clear_all.xml
index b0f3a5a46c993..187a420c2bd13 100644
--- a/packages/SystemUI/res/drawable/ic_clear_all.xml
+++ b/packages/SystemUI/res/drawable/ic_clear_all.xml
@@ -13,16 +13,13 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="32dp"
-        android:height="32dp"/>
-
-    <viewport
+        android:height="32dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M10.0,26.0l28.0,0.0l0.0,-4.0L10.0,22.0L10.0,26.0zM6.0,34.0l28.0,0.0l0.0,-4.0L6.0,30.0L6.0,34.0zM14.0,14.0l0.0,4.0l28.0,0.0l0.0,-4.0L14.0,14.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_lock_24dp.xml b/packages/SystemUI/res/drawable/ic_lock_24dp.xml
index b2e486c0adfe8..204af7e81f4c9 100644
--- a/packages/SystemUI/res/drawable/ic_lock_24dp.xml
+++ b/packages/SystemUI/res/drawable/ic_lock_24dp.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24.0dp"
-        android:height="24.0dp"/>
-
-    <viewport
+        android:height="24.0dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"/>
+        android:viewportHeight="24.0">
 
     <path
-        android:fill="@color/keyguard_affordance"
+        android:fillColor="@color/keyguard_affordance"
         android:pathData="M18.0,8.0l-1.0,0.0L17.0,6.0c0.0,-2.8 -2.2,-5.0 -5.0,-5.0C9.2,1.0 7.0,3.2 7.0,6.0l0.0,2.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.1 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0C20.0,8.9 19.1,8.0 18.0,8.0zM12.0,17.0c-1.1,0.0 -2.0,-0.9 -2.0,-2.0s0.9,-2.0 2.0,-2.0c1.1,0.0 2.0,0.9 2.0,2.0S13.1,17.0 12.0,17.0zM15.1,8.0L8.9,8.0L8.9,6.0c0.0,-1.7 1.4,-3.1 3.1,-3.1c1.7,0.0 3.1,1.4 3.1,3.1L15.1,8.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_lock_open_24dp.xml b/packages/SystemUI/res/drawable/ic_lock_open_24dp.xml
index 28b16dda7410d..c877f063b7a80 100644
--- a/packages/SystemUI/res/drawable/ic_lock_open_24dp.xml
+++ b/packages/SystemUI/res/drawable/ic_lock_open_24dp.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24.0dp"
-        android:height="24.0dp"/>
-
-    <viewport
+        android:height="24.0dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"/>
+        android:viewportHeight="24.0">
 
     <path
-        android:fill="@color/keyguard_affordance"
+        android:fillColor="@color/keyguard_affordance"
         android:pathData="M12.0,17.0c1.1,0.0 2.0,-0.9 2.0,-2.0s-0.9,-2.0 -2.0,-2.0c-1.1,0.0 -2.0,0.9 -2.0,2.0S10.9,17.0 12.0,17.0zM18.0,8.0l-1.0,0.0L17.0,6.0c0.0,-2.8 -2.2,-5.0 -5.0,-5.0C9.2,1.0 7.0,3.2 7.0,6.0l1.9,0.0c0.0,-1.7 1.4,-3.1 3.1,-3.1c1.7,0.0 3.1,1.4 3.1,3.1l0.0,2.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.1 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0C20.0,8.9 19.1,8.0 18.0,8.0zM18.0,20.0L6.0,20.0L6.0,10.0l12.0,0.0L18.0,20.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_lock_to_app_24dp.xml b/packages/SystemUI/res/drawable/ic_lock_to_app_24dp.xml
index e5737ee3d9487..2d779499f6e60 100644
--- a/packages/SystemUI/res/drawable/ic_lock_to_app_24dp.xml
+++ b/packages/SystemUI/res/drawable/ic_lock_to_app_24dp.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24.0dp"
-        android:height="24.0dp"/>
-
-    <viewport
+        android:height="24.0dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"/>
+        android:viewportHeight="24.0">
 
     <path
-        android:fill="@color/recents_task_view_lock_to_app_button_color"
+        android:fillColor="@color/recents_task_view_lock_to_app_button_color"
         android:pathData="M18.0,8.0l-1.0,0.0L17.0,6.0c0.0,-2.8 -2.2,-5.0 -5.0,-5.0C9.2,1.0 7.0,3.2 7.0,6.0l0.0,2.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.1 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0C20.0,8.9 19.1,8.0 18.0,8.0zM12.0,17.0c-1.1,0.0 -2.0,-0.9 -2.0,-2.0s0.9,-2.0 2.0,-2.0c1.1,0.0 2.0,0.9 2.0,2.0S13.1,17.0 12.0,17.0zM15.1,8.0L8.9,8.0L8.9,6.0c0.0,-1.7 1.4,-3.1 3.1,-3.1c1.7,0.0 3.1,1.4 3.1,3.1L15.1,8.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_power_low.xml b/packages/SystemUI/res/drawable/ic_power_low.xml
index 5bb7aba6fa748..ba99948a57370 100644
--- a/packages/SystemUI/res/drawable/ic_power_low.xml
+++ b/packages/SystemUI/res/drawable/ic_power_low.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24.0dp"
-        android:height="24.0dp"/>
-
-    <viewport
+        android:height="24.0dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M30.0,6.0L30.0,2.0L18.0,2.0l0.0,4.0l-8.0,0.0l0.0,40.0l28.0,0.0L38.0,6.0L30.0,6.0zM26.0,37.0l-4.0,0.0l0.0,-4.0l4.0,0.0L26.0,37.0zM26.0,30.0l-4.0,0.0L22.0,15.0l4.0,0.0L26.0,30.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_power_saver.xml b/packages/SystemUI/res/drawable/ic_power_saver.xml
index 26e7375d01bda..2162d79e7b8fb 100644
--- a/packages/SystemUI/res/drawable/ic_power_saver.xml
+++ b/packages/SystemUI/res/drawable/ic_power_saver.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24.0dp"
-        android:height="24.0dp"/>
-
-    <viewport
+        android:height="24.0dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M30.0,6.0L30.0,2.0L18.0,2.0l0.0,4.0l-8.0,0.0l0.0,40.0l28.0,0.0L38.0,6.0L30.0,6.0zM32.0,28.0l-6.0,0.0l0.0,6.0l-4.0,0.0l0.0,-6.0l-6.0,0.0l0.0,-4.0l6.0,0.0l0.0,-6.0l4.0,0.0l0.0,6.0l6.0,0.0L32.0,28.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_airplane_off.xml b/packages/SystemUI/res/drawable/ic_qs_airplane_off.xml
index c68238f24d206..79a9d409e6873 100644
--- a/packages/SystemUI/res/drawable/ic_qs_airplane_off.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_airplane_off.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64dp"
-        android:height="64dp"/>
-
-    <viewport
+        android:height="64dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#4DFFFFFF"
+        android:fillColor="#4DFFFFFF"
         android:pathData="M26.0,18.0L26.0,7.0c0.0,-1.7 -1.3,-3.0 -3.0,-3.0c-1.7,0.0 -3.0,1.3 -3.0,3.0l0.0,7.4L35.7,30.0l6.3,2.0l0.0,-4.0L26.0,18.0zM6.0,10.5l10.0,10.0L4.0,28.0l0.0,4.0l16.0,-5.0l0.0,11.0l-4.0,3.0l0.0,3.0l7.0,-2.0l7.0,2.0l0.0,-3.0l-4.0,-3.0l0.0,-7.5L37.5,42.0l2.5,-2.5L8.5,8.0L6.0,10.5z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_airplane_on.xml b/packages/SystemUI/res/drawable/ic_qs_airplane_on.xml
index c1e3c7e9a805e..5d5d2576c6cd9 100644
--- a/packages/SystemUI/res/drawable/ic_qs_airplane_on.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_airplane_on.xml
@@ -13,19 +13,16 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64dp"
-        android:height="64dp"/>
-
-    <viewport
+        android:height="64dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M20.4,18.0"/>
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M42.0,32.0l0.0,-4.0L26.0,18.0L26.0,7.0c0.0,-1.7 -1.3,-3.0 -3.0,-3.0c-1.7,0.0 -3.0,1.3 -3.0,3.0l0.0,11.0L4.0,28.0l0.0,4.0l16.0,-5.0l0.0,11.0l-4.0,3.0l0.0,3.0l7.0,-2.0l7.0,2.0l0.0,-3.0l-4.0,-3.0L26.0,27.0L42.0,32.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_back.xml b/packages/SystemUI/res/drawable/ic_qs_back.xml
index 52039f588cd28..f00ba03eb8296 100644
--- a/packages/SystemUI/res/drawable/ic_qs_back.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_back.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64dp"
-        android:height="64dp"/>
-
-    <viewport
+        android:height="64dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"/>
+        android:viewportHeight="24.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M20.0,11.0L7.8,11.0l5.6,-5.6L12.0,4.0l-8.0,8.0l8.0,8.0l1.4,-1.4L7.8,13.0L20.0,13.0L20.0,11.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_bluetooth_connected.xml b/packages/SystemUI/res/drawable/ic_qs_bluetooth_connected.xml
index 3957d02fdefda..0c65389349ae4 100644
--- a/packages/SystemUI/res/drawable/ic_qs_bluetooth_connected.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_bluetooth_connected.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64dp"
-        android:height="64dp"/>
-
-    <viewport
+        android:height="64dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M14.0,24.0l-4.0,-4.0l-4.0,4.0l4.0,4.0L14.0,24.0zM35.4,15.4L24.0,4.0l-2.0,0.0l0.0,15.2L12.8,10.0L10.0,12.8L21.2,24.0L10.0,35.2l2.8,2.8l9.2,-9.2L22.0,44.0l2.0,0.0l11.4,-11.4L26.8,24.0L35.4,15.4zM26.0,11.7l3.8,3.8L26.0,19.2L26.0,11.7zM29.8,32.6L26.0,36.3l0.0,-7.5L29.8,32.6zM38.0,20.0l-4.0,4.0l4.0,4.0l4.0,-4.0L38.0,20.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_bluetooth_connecting.xml b/packages/SystemUI/res/drawable/ic_qs_bluetooth_connecting.xml
index e4038f9d66d2a..b9a315cd74e3c 100644
--- a/packages/SystemUI/res/drawable/ic_qs_bluetooth_connecting.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_bluetooth_connecting.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64dp"
-        android:height="64dp"/>
-
-    <viewport
+        android:height="64dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M28.5,24.0l4.6,4.6c0.6,-1.4 0.9,-3.0 0.9,-4.7c0.0,-1.6 -0.3,-3.2 -0.9,-4.6L28.5,24.0zM39.1,13.4L36.5,16.0c1.3,2.4 2.0,5.1 2.0,8.0s-0.7,5.6 -2.0,8.0l2.4,2.4c1.9,-3.1 3.1,-6.7 3.1,-10.6C42.0,20.0 40.9,16.5 39.1,13.4zM31.4,15.4L20.0,4.0l-2.0,0.0l0.0,15.2L8.8,10.0L6.0,12.8L17.2,24.0L6.0,35.2L8.8,38.0l9.2,-9.2L18.0,44.0l2.0,0.0l11.4,-11.4L22.8,24.0L31.4,15.4zM22.0,11.7l3.8,3.8L22.0,19.2L22.0,11.7zM25.8,32.6L22.0,36.3l0.0,-7.5L25.8,32.6z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_bluetooth_detail_empty.xml b/packages/SystemUI/res/drawable/ic_qs_bluetooth_detail_empty.xml
index aa0b369648089..dd92126a6dc74 100644
--- a/packages/SystemUI/res/drawable/ic_qs_bluetooth_detail_empty.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_bluetooth_detail_empty.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="56dp"
-        android:height="56dp"/>
-
-    <viewport
+        android:height="56dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="@color/qs_detail_empty"
+        android:fillColor="@color/qs_detail_empty"
         android:pathData="M35.4,15.4L24.0,4.0l-2.0,0.0l0.0,15.2L12.8,10.0L10.0,12.8L21.2,24.0L10.0,35.2l2.8,2.8l9.2,-9.2L22.0,44.0l2.0,0.0l11.4,-11.4L26.8,24.0L35.4,15.4zM26.0,11.7l3.8,3.8L26.0,19.2L26.0,11.7zM29.8,32.6L26.0,36.3l0.0,-7.5L29.8,32.6z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_bluetooth_off.xml b/packages/SystemUI/res/drawable/ic_qs_bluetooth_off.xml
index 00c5af8a2ecf1..0cb1f32acb393 100644
--- a/packages/SystemUI/res/drawable/ic_qs_bluetooth_off.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_bluetooth_off.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64dp"
-        android:height="64dp"/>
-
-    <viewport
+        android:height="64dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#4DFFFFFF"
+        android:fillColor="#4DFFFFFF"
         android:pathData="M26.0,11.8l3.8,3.8l-3.2,3.2l2.8,2.8l6.0,-6.0L24.0,4.2l-2.0,0.0l0.0,10.1l4.0,4.0L26.0,11.8zM10.8,8.2L8.0,11.0l13.2,13.2L10.0,35.3l2.8,2.8L22.0,29.0l0.0,15.2l2.0,0.0l8.6,-8.6l4.6,4.6l2.8,-2.8L10.8,8.2zM26.0,36.5L26.0,29.0l3.8,3.8L26.0,36.5z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_bluetooth_on.xml b/packages/SystemUI/res/drawable/ic_qs_bluetooth_on.xml
index 2b14f33ab5147..9a68dad159eff 100644
--- a/packages/SystemUI/res/drawable/ic_qs_bluetooth_on.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_bluetooth_on.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64dp"
-        android:height="64dp"/>
-
-    <viewport
+        android:height="64dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M35.4,15.4L24.0,4.0l-2.0,0.0l0.0,15.2L12.8,10.0L10.0,12.8L21.2,24.0L10.0,35.2l2.8,2.8l9.2,-9.2L22.0,44.0l2.0,0.0l11.4,-11.4L26.8,24.0L35.4,15.4zM26.0,11.7l3.8,3.8L26.0,19.2L26.0,11.7zM29.8,32.6L26.0,36.3l0.0,-7.5L29.8,32.6z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_bugreport.xml b/packages/SystemUI/res/drawable/ic_qs_bugreport.xml
index 29588480a7492..0df1a9626ffc6 100644
--- a/packages/SystemUI/res/drawable/ic_qs_bugreport.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_bugreport.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64dp"
-        android:height="64dp"/>
-
-    <viewport
+        android:height="64dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"/>
+        android:viewportHeight="24.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M20.0,8.0l-2.8,0.0c-0.5,-0.8 -1.1,-1.5 -1.8,-2.0L17.0,4.4L15.6,3.0l-2.2,2.2C13.0,5.1 12.5,5.0 12.0,5.0s-1.0,0.1 -1.4,0.2L8.4,3.0L7.0,4.4L8.6,6.0C7.9,6.5 7.3,7.2 6.8,8.0L4.0,8.0l0.0,2.0l2.1,0.0C6.0,10.3 6.0,10.7 6.0,11.0l0.0,1.0L4.0,12.0l0.0,2.0l2.0,0.0l0.0,1.0c0.0,0.3 0.0,0.7 0.1,1.0L4.0,16.0l0.0,2.0l2.8,0.0c1.0,1.8 3.0,3.0 5.2,3.0s4.2,-1.2 5.2,-3.0L20.0,18.0l0.0,-2.0l-2.1,0.0c0.1,-0.3 0.1,-0.7 0.1,-1.0l0.0,-1.0l2.0,0.0l0.0,-2.0l-2.0,0.0l0.0,-1.0c0.0,-0.3 0.0,-0.7 -0.1,-1.0L20.0,10.0L20.0,8.0zM14.0,16.0l-4.0,0.0l0.0,-2.0l4.0,0.0L14.0,16.0zM14.0,12.0l-4.0,0.0l0.0,-2.0l4.0,0.0L14.0,12.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_cancel.xml b/packages/SystemUI/res/drawable/ic_qs_cancel.xml
index de72f130a3e41..e4f4174b9ca1c 100644
--- a/packages/SystemUI/res/drawable/ic_qs_cancel.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_cancel.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
-        android:height="24dp"/>
-
-    <viewport
+        android:height="24dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M24.0,4.0C12.9,4.0 4.0,12.9 4.0,24.0s8.9,20.0 20.0,20.0c11.1,0.0 20.0,-8.9 20.0,-20.0S35.1,4.0 24.0,4.0zM34.0,31.2L31.2,34.0L24.0,26.8L16.8,34.0L14.0,31.2l7.2,-7.2L14.0,16.8l2.8,-2.8l7.2,7.2l7.2,-7.2l2.8,2.8L26.8,24.0L34.0,31.2z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_cast_detail_empty.xml b/packages/SystemUI/res/drawable/ic_qs_cast_detail_empty.xml
index fbc21d4a43314..59dcea2337cb7 100644
--- a/packages/SystemUI/res/drawable/ic_qs_cast_detail_empty.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_cast_detail_empty.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="56dp"
-        android:height="56dp"/>
-
-    <viewport
+        android:height="56dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="@color/qs_detail_empty"
+        android:fillColor="@color/qs_detail_empty"
         android:pathData="M42.0,6.0L6.0,6.0c-2.2,0.0 -4.0,1.8 -4.0,4.0l0.0,6.0l4.0,0.0l0.0,-6.0l36.0,0.0l0.0,28.0L28.0,38.0l0.0,4.0l14.0,0.0c2.2,0.0 4.0,-1.8 4.0,-4.0L46.0,10.0C46.0,7.8 44.2,6.0 42.0,6.0zM2.0,36.0l0.0,6.0l6.0,0.0C8.0,38.7 5.3,36.0 2.0,36.0zM2.0,28.0l0.0,4.0c5.5,0.0 10.0,4.5 10.0,10.0l4.0,0.0C16.0,34.3 9.7,28.0 2.0,28.0zM2.0,20.0l0.0,4.0c9.9,0.0 18.0,8.1 18.0,18.0l4.0,0.0C24.0,29.8 14.1,20.0 2.0,20.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_cast_off.xml b/packages/SystemUI/res/drawable/ic_qs_cast_off.xml
index 2a9541e493a14..80517958dac23 100644
--- a/packages/SystemUI/res/drawable/ic_qs_cast_off.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_cast_off.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64dp"
-        android:height="64dp"/>
-
-    <viewport
+        android:height="64dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#4DFFFFFF"
+        android:fillColor="#4DFFFFFF"
         android:pathData="M42.0,6.0L6.0,6.0c-2.2,0.0 -4.0,1.8 -4.0,4.0l0.0,6.0l4.0,0.0l0.0,-6.0l36.0,0.0l0.0,28.0L28.0,38.0l0.0,4.0l14.0,0.0c2.2,0.0 4.0,-1.8 4.0,-4.0L46.0,10.0C46.0,7.8 44.2,6.0 42.0,6.0zM2.0,36.0l0.0,6.0l6.0,0.0C8.0,38.7 5.3,36.0 2.0,36.0zM2.0,28.0l0.0,4.0c5.5,0.0 10.0,4.5 10.0,10.0l4.0,0.0C16.0,34.3 9.7,28.0 2.0,28.0zM2.0,20.0l0.0,4.0c9.9,0.0 18.0,8.1 18.0,18.0l4.0,0.0C24.0,29.8 14.1,20.0 2.0,20.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_cast_on.xml b/packages/SystemUI/res/drawable/ic_qs_cast_on.xml
index 159bf65256c96..794eb9e6bd588 100644
--- a/packages/SystemUI/res/drawable/ic_qs_cast_on.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_cast_on.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64dp"
-        android:height="64dp"/>
-
-    <viewport
+        android:height="64dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M2.0,36.0l0.0,6.0l6.0,0.0C8.0,38.7 5.3,36.0 2.0,36.0zM2.0,28.0l0.0,4.0c5.5,0.0 10.0,4.5 10.0,10.0l4.0,0.0C16.0,34.3 9.7,28.0 2.0,28.0zM38.0,14.0L10.0,14.0l0.0,3.3c7.9,2.6 14.2,8.8 16.7,16.7L38.0,34.0L38.0,14.0zM2.0,20.0l0.0,4.0c9.9,0.0 18.0,8.1 18.0,18.0l4.0,0.0C24.0,29.8 14.1,20.0 2.0,20.0zM42.0,6.0L6.0,6.0c-2.2,0.0 -4.0,1.8 -4.0,4.0l0.0,6.0l4.0,0.0l0.0,-6.0l36.0,0.0l0.0,28.0L28.0,38.0l0.0,4.0l14.0,0.0c2.2,0.0 4.0,-1.8 4.0,-4.0L46.0,10.0C46.0,7.8 44.2,6.0 42.0,6.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_flashlight_off.xml b/packages/SystemUI/res/drawable/ic_qs_flashlight_off.xml
index 0f30be2a5a7b3..d4bd76fbc8a69 100644
--- a/packages/SystemUI/res/drawable/ic_qs_flashlight_off.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_flashlight_off.xml
@@ -13,22 +13,19 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64.0dp"
-        android:height="64.0dp"/>
-
-    <viewport
+        android:height="64.0dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#4DFFFFFF"
+        android:fillColor="#4DFFFFFF"
         android:pathData="M14.708,11.394l14.899,14.9l0.0,-6.771c4.359,-2.353 3.831,-7.489 3.831,-7.489l0.0,-0.64L14.708,11.393998z"/>
     <path
-        android:fill="#4DFFFFFF"
+        android:fillColor="#4DFFFFFF"
         android:pathData="M14.568,4.0l18.87,0.0l0.0,3.917l-18.87,0.0z"/>
     <path
-        android:fill="#4DFFFFFF"
+        android:fillColor="#4DFFFFFF"
         android:pathData="M38.284,39.427l-29.767,-29.766998 -2.4750004,2.4750004 12.351999,12.351 0.0,19.514 11.213001,0.0 0.0,-8.300999 6.2019978,6.2019997z"/>
 </vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_qs_flashlight_on.xml b/packages/SystemUI/res/drawable/ic_qs_flashlight_on.xml
index 2e9d401314468..5514b44c1481d 100644
--- a/packages/SystemUI/res/drawable/ic_qs_flashlight_on.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_flashlight_on.xml
@@ -13,19 +13,16 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64.0dp"
-        android:height="64.0dp"/>
-
-    <viewport
+        android:height="64.0dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M33.438,12.034l0.0,-0.64l-18.87,0.0l0.0,0.64c0.0,0.0 -0.581,5.189 3.826,7.523L18.394,44.0l11.213,0.0L29.606998,19.523C33.966,17.17 33.438,12.034 33.438,12.034zM24.0,27.697c-1.523,0.0 -2.757,-1.234 -2.757,-2.757c0.0,-1.523 1.234,-2.757 2.757,-2.757c1.523,0.0 2.757,1.234 2.757,2.757C26.757,26.462 25.523,27.697 24.0,27.697z"/>
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M14.568,4.0l18.87,0.0l0.0,3.917l-18.87,0.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_hotspot_off.xml b/packages/SystemUI/res/drawable/ic_qs_hotspot_off.xml
index 0a00d14c8aeb3..d68ee4c2f65b3 100644
--- a/packages/SystemUI/res/drawable/ic_qs_hotspot_off.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_hotspot_off.xml
@@ -13,16 +13,12 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64.0dp"
-        android:height="64.0dp"/>
-
-    <viewport
+        android:height="64.0dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
-
+        android:viewportHeight="48.0">
     <path
-        android:fill="#4DFFFFFF"
+        android:fillColor="#4DFFFFFF"
         android:pathData="M35.099998,28.500000c0.600000,-1.400000 0.900000,-2.900000 0.900000,-4.500000c0.000000,-6.600000 -5.400000,-12.000000 -12.000000,-12.000000c-1.600000,0.000000 -3.100000,0.300000 -4.500000,0.900000l3.200000,3.200000c0.400000,-0.100000 0.800000,-0.100000 1.200000,-0.100000c4.400000,0.000000 8.000000,3.600000 8.000000,8.000000c0.000000,0.400000 0.000000,0.800000 -0.100000,1.300000L35.099998,28.500000zM24.000000,8.000000c8.800000,0.000000 16.000000,7.200000 16.000000,16.000000c0.000000,2.700000 -0.700000,5.200000 -1.900000,7.500000l2.900000,2.900000c1.900000,-3.000000 3.000000,-6.600000 3.000000,-10.400000c0.000000,-11.000000 -9.000000,-20.000000 -20.000000,-20.000000c-3.800000,0.000000 -7.400000,1.100000 -10.400000,2.900000l2.900000,2.900000C18.700001,8.700000 21.299999,8.000000 24.000000,8.000000zM6.500000,5.000000L4.000000,7.500000l4.200000,4.200000C5.600000,15.100000 4.000000,19.400000 4.000000,24.000000c0.000000,7.400000 4.000000,13.800000 10.000000,17.299999l2.000000,-3.500000c-4.800000,-2.800000 -8.000000,-7.900000 -8.000000,-13.800000c0.000000,-3.500000 1.100000,-6.800000 3.100000,-9.400000l2.900000,2.900000C12.700000,19.400000 12.000000,21.600000 12.000000,24.000000c0.000000,4.400000 2.400000,8.300000 6.000000,10.400000l2.000000,-3.500000c-2.400000,-1.400000 -4.000000,-3.900000 -4.000000,-6.900000c0.000000,-1.300000 0.300000,-2.500000 0.900000,-3.600000l3.200000,3.200000c0.000000,0.100000 0.000000,0.300000 0.000000,0.400000c0.000000,2.200000 1.800000,4.000000 4.000000,4.000000c0.100000,0.000000 0.300000,0.000000 0.400000,0.000000l0.000000,0.000000l0.000000,0.000000l15.000000,15.000000l2.500000,-2.500000L8.500000,7.000000L6.500000,5.000000z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_hotspot_on.xml b/packages/SystemUI/res/drawable/ic_qs_hotspot_on.xml
index 01cb0ab3c544c..da09f6e39f4e5 100644
--- a/packages/SystemUI/res/drawable/ic_qs_hotspot_on.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_hotspot_on.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64.0dp"
-        android:height="64.0dp"/>
-
-    <viewport
+        android:height="64.0dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M24.000000,22.000000c-2.200000,0.000000 -4.000000,1.800000 -4.000000,4.000000c0.000000,2.200000 1.800000,4.000000 4.000000,4.000000c2.200000,0.000000 4.000000,-1.800000 4.000000,-4.000000C28.000000,23.799999 26.200001,22.000000 24.000000,22.000000zM36.000000,26.000000c0.000000,-6.600000 -5.400000,-12.000000 -12.000000,-12.000000c-6.600000,0.000000 -12.000000,5.400000 -12.000000,12.000000c0.000000,4.400000 2.400000,8.300000 6.000000,10.400000l2.000000,-3.500000c-2.400000,-1.400000 -4.000000,-3.900000 -4.000000,-6.900000c0.000000,-4.400000 3.600000,-8.000000 8.000000,-8.000000s8.000000,3.600000 8.000000,8.000000c0.000000,3.000000 -1.600000,5.500000 -4.000000,6.900000l2.000000,3.500000C33.599998,34.299999 36.000000,30.400000 36.000000,26.000000zM24.000000,6.000000C13.000000,6.000000 4.000000,15.000000 4.000000,26.000000c0.000000,7.400000 4.000000,13.800000 10.000000,17.299999l2.000000,-3.500000c-4.800000,-2.800000 -8.000000,-7.900000 -8.000000,-13.800000c0.000000,-8.800000 7.200000,-16.000000 16.000000,-16.000000s16.000000,7.200000 16.000000,16.000000c0.000000,5.900000 -3.200000,11.100000 -8.000000,13.800000l2.000000,3.500000c6.000000,-3.500000 10.000000,-9.900000 10.000000,-17.299999C44.000000,15.000000 35.000000,6.000000 24.000000,6.000000z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_inversion_off.xml b/packages/SystemUI/res/drawable/ic_qs_inversion_off.xml
index b6a5cadfe0c82..4237b63c5eb41 100644
--- a/packages/SystemUI/res/drawable/ic_qs_inversion_off.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_inversion_off.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64dp"
-        android:height="64dp"/>
-
-    <viewport
+        android:height="64dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#4DFFFFFF"
+        android:fillColor="#4DFFFFFF"
         android:pathData="M41.3,41.7L36.6,37.0L24.0,24.5l-7.1,-7.1L14.0,14.5L8.5,9.0L6.0,11.5l5.6,5.6c-5.1,6.3 -4.7,15.5 1.1,21.4c3.1,3.1 7.2,4.7 11.3,4.7c3.6,0.0 7.1,-1.2 10.1,-3.6l5.4,5.4l2.5,-2.5L41.3,41.7zM24.0,39.2c-3.2,0.0 -6.2,-1.2 -8.5,-3.5c-2.3,-2.3 -3.5,-5.3 -3.5,-8.5c0.0,-2.6 0.9,-5.1 2.4,-7.2l9.6,9.6L24.0,39.2zM24.0,10.2l0.0,9.2l14.5,14.5c2.7,-5.9 1.7,-13.1 -3.2,-18.0L24.0,4.5l0.0,0.0l0.0,0.0L16.6,12.0l2.8,2.8L24.0,10.2z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_inversion_on.xml b/packages/SystemUI/res/drawable/ic_qs_inversion_on.xml
index e8d59e0dad9d8..860e76963f5ef 100644
--- a/packages/SystemUI/res/drawable/ic_qs_inversion_on.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_inversion_on.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64dp"
-        android:height="64dp"/>
-
-    <viewport
+        android:height="64dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M35.3,15.9L24.0,4.5l0.0,0.0l0.0,0.0L12.7,15.9c-6.2,6.2 -6.2,16.4 0.0,22.6c3.1,3.1 7.2,4.7 11.3,4.7s8.2,-1.6 11.3,-4.7C41.6,32.2 41.6,22.1 35.3,15.9zM24.0,39.2L24.0,39.2c-3.2,0.0 -6.2,-1.2 -8.5,-3.5c-2.3,-2.3 -3.5,-5.3 -3.5,-8.5s1.2,-6.2 3.5,-8.5l8.5,-8.5L24.0,39.2z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_location_off.xml b/packages/SystemUI/res/drawable/ic_qs_location_off.xml
index 26ebfbf050b18..e0fe12ee2fe0a 100644
--- a/packages/SystemUI/res/drawable/ic_qs_location_off.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_location_off.xml
@@ -13,19 +13,16 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64dp"
-        android:height="64dp"/>
-
-    <viewport
+        android:height="64dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#4DFFFFFF"
+        android:fillColor="#4DFFFFFF"
         android:pathData="M24.0,13.0c2.8,0.0 5.0,2.2 5.0,5.0c0.0,1.5 -0.7,2.8 -1.7,3.7l7.3,7.3c2.0,-3.7 3.4,-7.6 3.4,-11.0c0.0,-7.7 -6.3,-14.0 -14.0,-14.0c-4.0,0.0 -7.5,1.6 -10.1,4.3l6.4,6.4C21.2,13.6 22.5,13.0 24.0,13.0zM32.7,32.2l-9.3,-9.3l-0.2,-0.2L6.5,6.0L4.0,8.5l6.4,6.4c-0.2,1.0 -0.4,2.0 -0.4,3.1c0.0,10.5 14.0,26.0 14.0,26.0s3.3,-3.7 6.8,-8.7l6.7,6.7l2.5,-2.5L32.7,32.2z"/>
     <path
         android:pathData="M23.5,22.9l0.0,0.0 -0.20000076,-0.19999886z"
-        android:fill="#4DFFFFFF"/>
+        android:fillColor="#4DFFFFFF"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_location_on.xml b/packages/SystemUI/res/drawable/ic_qs_location_on.xml
index bc73005ff8913..6a7cd53930fed 100644
--- a/packages/SystemUI/res/drawable/ic_qs_location_on.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_location_on.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64dp"
-        android:height="64dp"/>
-
-    <viewport
+        android:height="64dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M24.0,4.0c-7.7,0.0 -14.0,6.3 -14.0,14.0c0.0,10.5 14.0,26.0 14.0,26.0s14.0,-15.5 14.0,-26.0C38.0,10.3 31.7,4.0 24.0,4.0zM24.0,23.0c-2.8,0.0 -5.0,-2.2 -5.0,-5.0s2.2,-5.0 5.0,-5.0c2.8,0.0 5.0,2.2 5.0,5.0S26.8,23.0 24.0,23.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_minus.xml b/packages/SystemUI/res/drawable/ic_qs_minus.xml
index 7b76e0f4d56e1..4722c9edcc403 100644
--- a/packages/SystemUI/res/drawable/ic_qs_minus.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_minus.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
-        android:height="24dp"/>
-
-    <viewport
+        android:height="24dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M24.0,4.0C13.0,4.0 4.0,13.0 4.0,24.0s9.0,20.0 20.0,20.0c11.0,0.0 20.0,-9.0 20.0,-20.0S35.0,4.0 24.0,4.0zM34.0,26.0L14.0,26.0l0.0,-4.0l20.0,0.0L34.0,26.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_plus.xml b/packages/SystemUI/res/drawable/ic_qs_plus.xml
index 4b9f5062a993d..17d74cfec1364 100644
--- a/packages/SystemUI/res/drawable/ic_qs_plus.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_plus.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
-        android:height="24dp"/>
-
-    <viewport
+        android:height="24dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M24.0,4.0C13.0,4.0 4.0,13.0 4.0,24.0s9.0,20.0 20.0,20.0c11.0,0.0 20.0,-9.0 20.0,-20.0S35.0,4.0 24.0,4.0zM34.0,26.0l-8.0,0.0l0.0,8.0l-4.0,0.0l0.0,-8.0l-8.0,0.0l0.0,-4.0l8.0,0.0l0.0,-8.0l4.0,0.0l0.0,8.0l8.0,0.0L34.0,26.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_ringer_audible.xml b/packages/SystemUI/res/drawable/ic_qs_ringer_audible.xml
index 787eec5517153..9c5983d4d6e40 100644
--- a/packages/SystemUI/res/drawable/ic_qs_ringer_audible.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_ringer_audible.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64dp"
-        android:height="64dp"/>
-
-    <viewport
+        android:height="64dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"/>
+        android:viewportHeight="24.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M11.5,22.0c1.1,0.0 2.0,-0.9 2.0,-2.0l-4.0,0.0C9.5,21.1 10.4,22.0 11.5,22.0zM18.0,16.0l0.0,-5.5c0.0,-3.1 -2.1,-5.6 -5.0,-6.3L13.0,3.5C13.0,2.7 12.3,2.0 11.5,2.0C10.7,2.0 10.0,2.7 10.0,3.5l0.0,0.7c-2.9,0.7 -5.0,3.2 -5.0,6.3L5.0,16.0l-2.0,2.0l0.0,1.0l17.0,0.0l0.0,-1.0L18.0,16.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_ringer_silent.xml b/packages/SystemUI/res/drawable/ic_qs_ringer_silent.xml
index dd6be76093d06..904ccdfb70ad3 100644
--- a/packages/SystemUI/res/drawable/ic_qs_ringer_silent.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_ringer_silent.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64dp"
-        android:height="64dp"/>
-
-    <viewport
+        android:height="64dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"/>
+        android:viewportHeight="24.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M11.5,22.0c1.1,0.0 2.0,-0.9 2.0,-2.0l-4.0,0.0C9.5,21.1 10.4,22.0 11.5,22.0zM18.0,10.5c0.0,-3.1 -2.1,-5.6 -5.0,-6.3L13.0,3.5C13.0,2.7 12.3,2.0 11.5,2.0C10.7,2.0 10.0,2.7 10.0,3.5l0.0,0.7C9.5,4.3 9.0,4.5 8.6,4.7l9.4,9.4L18.0,10.5zM17.7,19.0l2.0,2.0l1.3,-1.3L4.3,3.0L3.0,4.3l2.9,2.9C5.3,8.2 5.0,9.3 5.0,10.5L5.0,16.0l-2.0,2.0l0.0,1.0L17.7,19.0z" />
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_ringer_vibrate.xml b/packages/SystemUI/res/drawable/ic_qs_ringer_vibrate.xml
index 96d20e8ecb9bb..a23c6f0afa9cb 100644
--- a/packages/SystemUI/res/drawable/ic_qs_ringer_vibrate.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_ringer_vibrate.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64dp"
-        android:height="64dp"/>
-
-    <viewport
+        android:height="64dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"/>
+        android:viewportHeight="24.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M0.0,15.0l2.0,0.0L2.0,9.0L0.0,9.0L0.0,15.0zM3.0,17.0l2.0,0.0L5.0,7.0L3.0,7.0L3.0,17.0zM22.0,9.0l0.0,6.0l2.0,0.0L24.0,9.0L22.0,9.0zM19.0,17.0l2.0,0.0L21.0,7.0l-2.0,0.0L19.0,17.0zM16.5,3.0l-9.0,0.0C6.7,3.0 6.0,3.7 6.0,4.5l0.0,15.0C6.0,20.3 6.7,21.0 7.5,21.0l9.0,0.0c0.8,0.0 1.5,-0.7 1.5,-1.5l0.0,-15.0C18.0,3.7 17.3,3.0 16.5,3.0zM16.0,19.0L8.0,19.0L8.0,5.0l8.0,0.0L16.0,19.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_rotation_landscape.xml b/packages/SystemUI/res/drawable/ic_qs_rotation_landscape.xml
index e4c7cb589f497..4bb3668f9108c 100644
--- a/packages/SystemUI/res/drawable/ic_qs_rotation_landscape.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_rotation_landscape.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64dp"
-        android:height="64dp"/>
-
-    <viewport
+        android:height="64dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M2.0,14.0l0.0,20.0c0.0,2.2 1.8,4.0 4.0,4.0l36.0,0.0c2.2,0.0 4.0,-1.8 4.0,-4.0L46.0,14.0c0.0,-2.2 -1.8,-4.0 -4.0,-4.0L6.0,10.0C3.8,10.0 2.0,11.8 2.0,14.0zM38.0,14.0l0.0,20.0L10.0,34.0L10.0,14.0L38.0,14.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_rotation_portrait.xml b/packages/SystemUI/res/drawable/ic_qs_rotation_portrait.xml
index e4bf367db694c..f0878c7113643 100644
--- a/packages/SystemUI/res/drawable/ic_qs_rotation_portrait.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_rotation_portrait.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64dp"
-        android:height="64dp"/>
-
-    <viewport
+        android:height="64dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M34.0,2.0L14.0,2.0c-2.2,0.0 -4.0,1.8 -4.0,4.0l0.0,36.0c0.0,2.2 1.8,4.0 4.0,4.0l20.0,0.0c2.2,0.0 4.0,-1.8 4.0,-4.0L38.0,6.0C38.0,3.8 36.2,2.0 34.0,2.0zM34.0,38.0L14.0,38.0L14.0,10.0l20.0,0.0L34.0,38.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_rotation_unlocked.xml b/packages/SystemUI/res/drawable/ic_qs_rotation_unlocked.xml
index a6c2cf8c2f7e0..6872a33198cb0 100644
--- a/packages/SystemUI/res/drawable/ic_qs_rotation_unlocked.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_rotation_unlocked.xml
@@ -13,22 +13,19 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64dp"
-        android:height="64dp"/>
-
-    <viewport
+        android:height="64dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"/>
+        android:viewportHeight="24.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M10.25,1.75c-0.6,-0.6 -1.5,-0.6 -2.1,0.0l-6.4,6.4c-0.6,0.6 -0.6,1.5 0.0,2.1l12.0,12.0c0.6,0.6 1.5,0.6 2.1,0.0l6.4,-6.4c0.6,-0.6 0.6,-1.5 0.0,-2.1L10.25,1.75zM14.85,21.25l-12.0,-12.0l6.4,-6.4l12.0,12.0L14.85,21.25z"/>
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M16.55,2.5c3.3,1.5 5.6,4.7 6.0,8.5l1.5,0.0c-0.6,-6.2 -5.7,-11.0 -12.0,-11.0c-0.2,0.0 -0.4,0.0 -0.7,0.0l3.8,3.8L16.55,2.5z"/>
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M7.55,21.5c-3.3,-1.5 -5.6,-4.7 -6.0,-8.5l-1.4,0.0c0.5,6.2 5.6,11.0 11.9,11.0c0.2,0.0 0.4,0.0 0.7,0.0l-3.8,-3.8L7.55,21.5z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_detail_empty.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_detail_empty.xml
index 16fa30bbc9b95..ad6b247490d1c 100644
--- a/packages/SystemUI/res/drawable/ic_qs_wifi_detail_empty.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_wifi_detail_empty.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="56dp"
-        android:height="56dp"/>
-
-    <viewport
+        android:height="56dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
         android:pathData="M24.0,4.0C15.0,4.0 6.7,7.0 0.0,12.0l24.0,32.0l24.0,-32.0C41.3,7.0 33.0,4.0 24.0,4.0z"
-        android:fill="@color/qs_detail_empty" />
+        android:fillColor="@color/qs_detail_empty" />
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_ringer_audible.xml b/packages/SystemUI/res/drawable/ic_ringer_audible.xml
index 296994825b1fb..f358fa2e39a83 100644
--- a/packages/SystemUI/res/drawable/ic_ringer_audible.xml
+++ b/packages/SystemUI/res/drawable/ic_ringer_audible.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="32dp"
-        android:height="32dp"/>
-
-    <viewport
+        android:height="32dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"/>
+        android:viewportHeight="24.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M11.5,22.0c1.1,0.0 2.0,-0.9 2.0,-2.0l-4.0,0.0C9.5,21.1 10.4,22.0 11.5,22.0zM18.0,16.0l0.0,-5.5c0.0,-3.1 -2.1,-5.6 -5.0,-6.3L13.0,3.5C13.0,2.7 12.3,2.0 11.5,2.0C10.7,2.0 10.0,2.7 10.0,3.5l0.0,0.7c-2.9,0.7 -5.0,3.2 -5.0,6.3L5.0,16.0l-2.0,2.0l0.0,1.0l17.0,0.0l0.0,-1.0L18.0,16.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_ringer_vibrate.xml b/packages/SystemUI/res/drawable/ic_ringer_vibrate.xml
index d8ded5844dc4b..9642be308f5ce 100644
--- a/packages/SystemUI/res/drawable/ic_ringer_vibrate.xml
+++ b/packages/SystemUI/res/drawable/ic_ringer_vibrate.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="32dp"
-        android:height="32dp"/>
-
-    <viewport
+        android:height="32dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"/>
+        android:viewportHeight="24.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M0.0,15.0l2.0,0.0L2.0,9.0L0.0,9.0L0.0,15.0zM3.0,17.0l2.0,0.0L5.0,7.0L3.0,7.0L3.0,17.0zM22.0,9.0l0.0,6.0l2.0,0.0L24.0,9.0L22.0,9.0zM19.0,17.0l2.0,0.0L21.0,7.0l-2.0,0.0L19.0,17.0zM16.5,3.0l-9.0,0.0C6.7,3.0 6.0,3.7 6.0,4.5l0.0,15.0C6.0,20.3 6.7,21.0 7.5,21.0l9.0,0.0c0.8,0.0 1.5,-0.7 1.5,-1.5l0.0,-15.0C18.0,3.7 17.3,3.0 16.5,3.0zM16.0,19.0L8.0,19.0L8.0,5.0l8.0,0.0L16.0,19.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_settings_24dp.xml b/packages/SystemUI/res/drawable/ic_settings_24dp.xml
index a2f78225b77b2..9c7874215cf76 100644
--- a/packages/SystemUI/res/drawable/ic_settings_24dp.xml
+++ b/packages/SystemUI/res/drawable/ic_settings_24dp.xml
@@ -12,18 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-<size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
 android:width="24dp"
-android:height="24dp"/>
-
-    <viewport android:viewportWidth="24.0"
-          android:viewportHeight="24.0"/>
+android:height="24dp" android:viewportWidth="24.0"
+          android:viewportHeight="24.0">
 
 
 <path
      android:pathData="M19.4,13.0c0.0,-0.3 0.1,-0.6 0.1,-1.0s0.0,-0.7 -0.1,-1.0l2.1,-1.7c0.2,-0.2 0.2,-0.4 0.1,-0.6l-2.0,-3.5C19.5,5.1 19.3,5.0 19.0,5.1l-2.5,1.0c-0.5,-0.4 -1.1,-0.7 -1.7,-1.0l-0.4,-2.6C14.5,2.2 14.2,2.0 14.0,2.0l-4.0,0.0C9.8,2.0 9.5,2.2 9.5,2.4L9.1,5.1C8.5,5.3 8.0,5.7 7.4,6.1L5.0,5.1C4.7,5.0 4.5,5.1 4.3,5.3l-2.0,3.5C2.2,8.9 2.3,9.2 2.5,9.4L4.6,11.0c0.0,0.3 -0.1,0.6 -0.1,1.0s0.0,0.7 0.1,1.0l-2.1,1.7c-0.2,0.2 -0.2,0.4 -0.1,0.6l2.0,3.5C4.5,18.9 4.7,19.0 5.0,18.9l2.5,-1.0c0.5,0.4 1.1,0.7 1.7,1.0l0.4,2.6c0.0,0.2 0.2,0.4 0.5,0.4l4.0,0.0c0.2,0.0 0.5,-0.2 0.5,-0.4l0.4,-2.6c0.6,-0.3 1.2,-0.6 1.7,-1.0l2.5,1.0c0.2,0.1 0.5,0.0 0.6,-0.2l2.0,-3.5c0.1,-0.2 0.1,-0.5 -0.1,-0.6L19.4,13.0zM12.0,15.5c-1.9,0.0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5s3.5,1.6 3.5,3.5S13.9,15.5 12.0,15.5z"
-     android:fill="#ffffffff"
+     android:fillColor="#ffffffff"
      />
 
 </vector>
diff --git a/packages/SystemUI/res/drawable/qs_dual_tile_caret.xml b/packages/SystemUI/res/drawable/qs_dual_tile_caret.xml
index 9137e7f6a0b95..71400dbedc6ac 100644
--- a/packages/SystemUI/res/drawable/qs_dual_tile_caret.xml
+++ b/packages/SystemUI/res/drawable/qs_dual_tile_caret.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24.0dp"
-        android:height="24.0dp"/>
-
-    <viewport
+        android:height="24.0dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="@color/qs_tile_text"
+        android:fillColor="@color/qs_tile_text"
         android:pathData="M14.0,20.0l10.0,10.0 10.0,-10.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/qs_subhead_caret.xml b/packages/SystemUI/res/drawable/qs_subhead_caret.xml
index f140bd0adda4d..13a168d758aa4 100644
--- a/packages/SystemUI/res/drawable/qs_subhead_caret.xml
+++ b/packages/SystemUI/res/drawable/qs_subhead_caret.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24.0dp"
-        android:height="24.0dp"/>
-
-    <viewport
+        android:height="24.0dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="@color/qs_subhead"
+        android:fillColor="@color/qs_subhead"
         android:pathData="M14.0,20.0l10.0,10.0 10.0,-10.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/recents_dismiss_dark.xml b/packages/SystemUI/res/drawable/recents_dismiss_dark.xml
index 9c1165de6175c..337c028b77c8b 100644
--- a/packages/SystemUI/res/drawable/recents_dismiss_dark.xml
+++ b/packages/SystemUI/res/drawable/recents_dismiss_dark.xml
@@ -13,20 +13,16 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="16dp"
-        android:width="16dp" />
-
-    <viewport
+        android:width="16dp"
         android:viewportHeight="100"
-        android:viewportWidth="100" />
+        android:viewportWidth="100" >
 
     <path
         android:name="x"
         android:pathData="M0,0L100,100M0,100L100,0z"
-        android:stroke="@color/recents_task_bar_dark_dismiss_color"
+        android:strokeColor="@color/recents_task_bar_dark_dismiss_color"
         android:strokeWidth="8.0"
         android:strokeLineCap="square" />
 
diff --git a/packages/SystemUI/res/drawable/recents_dismiss_light.xml b/packages/SystemUI/res/drawable/recents_dismiss_light.xml
index a8afeb3134359..963ccf7be00d9 100644
--- a/packages/SystemUI/res/drawable/recents_dismiss_light.xml
+++ b/packages/SystemUI/res/drawable/recents_dismiss_light.xml
@@ -13,21 +13,17 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="16dp"
-        android:width="16dp" />
-
-    <viewport
+        android:width="16dp"
         android:viewportHeight="100"
-        android:viewportWidth="100" />
+        android:viewportWidth="100" >
 
 
     <path
         android:name="x"
         android:pathData="M0,0L100,100M0,100L100,0z"
-        android:stroke="@color/recents_task_bar_light_dismiss_color"
+        android:strokeColor="@color/recents_task_bar_light_dismiss_color"
         android:strokeWidth="8.0"
         android:strokeLineCap="square" />
 
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth.xml b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth.xml
index e28490bfb890c..f53f0e4729dfd 100644
--- a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth.xml
+++ b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="18dp"
-        android:height="18dp"/>
-
-    <viewport
+        android:height="18dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M35.4,15.4L24.0,4.0l-2.0,0.0l0.0,15.2L12.8,10.0L10.0,12.8L21.2,24.0L10.0,35.2l2.8,2.8l9.2,-9.2L22.0,44.0l2.0,0.0l11.4,-11.4L26.8,24.0L35.4,15.4zM26.0,11.7l3.8,3.8L26.0,19.2L26.0,11.7zM29.8,32.6L26.0,36.3l0.0,-7.5L29.8,32.6z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected.xml b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected.xml
index c012d14a7fbaa..2aac4ee03c3c9 100644
--- a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected.xml
+++ b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="18dp"
-        android:height="18dp"/>
-
-    <viewport
+        android:height="18dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M14.0,24.0l-4.0,-4.0l-4.0,4.0l4.0,4.0L14.0,24.0zM35.4,15.4L24.0,4.0l-2.0,0.0l0.0,15.2L12.8,10.0L10.0,12.8L21.2,24.0L10.0,35.2l2.8,2.8l9.2,-9.2L22.0,44.0l2.0,0.0l11.4,-11.4L26.8,24.0L35.4,15.4zM26.0,11.7l3.8,3.8L26.0,19.2L26.0,11.7zM29.8,32.6L26.0,36.3l0.0,-7.5L29.8,32.6zM38.0,20.0l-4.0,4.0l4.0,4.0l4.0,-4.0L38.0,20.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_no_sim.xml b/packages/SystemUI/res/drawable/stat_sys_no_sim.xml
index 70948b7f4d5f4..22d1d4b8beac5 100644
--- a/packages/SystemUI/res/drawable/stat_sys_no_sim.xml
+++ b/packages/SystemUI/res/drawable/stat_sys_no_sim.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="18dp"
-        android:height="18dp"/>
-
-    <viewport
+        android:height="18dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"/>
+        android:viewportHeight="24.0">
 
     <path
-        android:fill="#4DFFFFFF"
+        android:fillColor="#4DFFFFFF"
         android:pathData="M19.0,5.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0l-7.0,0.0L7.7,5.3L19.0,16.7L19.0,5.0zM3.7,3.9L2.4,5.2L5.0,7.8L5.0,19.0c0.0,1.1 0.9,2.0 2.0,2.0l10.0,0.0c0.4,0.0 0.7,-0.1 1.0,-0.3l1.9,1.9l1.3,-1.3L3.7,3.9z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_ringer_vibrate.xml b/packages/SystemUI/res/drawable/stat_sys_ringer_vibrate.xml
index e1d63c3743581..352d86ff8c66d 100644
--- a/packages/SystemUI/res/drawable/stat_sys_ringer_vibrate.xml
+++ b/packages/SystemUI/res/drawable/stat_sys_ringer_vibrate.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="20dp"
-        android:height="20dp"/>
-
-    <viewport
+        android:height="20dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"/>
+        android:viewportHeight="24.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M0.0,15.0l2.0,0.0L2.0,9.0L0.0,9.0L0.0,15.0zM3.0,17.0l2.0,0.0L5.0,7.0L3.0,7.0L3.0,17.0zM22.0,9.0l0.0,6.0l2.0,0.0L24.0,9.0L22.0,9.0zM19.0,17.0l2.0,0.0L21.0,7.0l-2.0,0.0L19.0,17.0zM16.5,3.0l-9.0,0.0C6.7,3.0 6.0,3.7 6.0,4.5l0.0,15.0C6.0,20.3 6.7,21.0 7.5,21.0l9.0,0.0c0.8,0.0 1.5,-0.7 1.5,-1.5l0.0,-15.0C18.0,3.7 17.3,3.0 16.5,3.0zM16.0,19.0L8.0,19.0L8.0,5.0l8.0,0.0L16.0,19.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_zen_important.xml b/packages/SystemUI/res/drawable/stat_sys_zen_important.xml
index 54a9b1b61a36e..73d7cba56b19d 100644
--- a/packages/SystemUI/res/drawable/stat_sys_zen_important.xml
+++ b/packages/SystemUI/res/drawable/stat_sys_zen_important.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="20dp"
-        android:height="20dp"/>
-
-    <viewport
+        android:height="20dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"/>
+        android:viewportHeight="24.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M12.0,17.273l6.1800003,3.7269993 -1.6350002,-7.0290003 5.455,-4.7269993 -7.191,-0.6170006 -2.809,-6.627 -2.809,6.627 -7.191,0.6170006 5.455,4.7269993 -1.6349998,7.0290003z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_zen_none.xml b/packages/SystemUI/res/drawable/stat_sys_zen_none.xml
index 101e3c467c963..d8ab078c14a84 100644
--- a/packages/SystemUI/res/drawable/stat_sys_zen_none.xml
+++ b/packages/SystemUI/res/drawable/stat_sys_zen_none.xml
@@ -13,16 +13,13 @@ Copyright (C) 2014 The Android Open Source Project
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="19dp"
-        android:height="19dp"/>
-
-    <viewport
+        android:height="19dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0"/>
+        android:viewportHeight="48.0">
 
     <path
-        android:fill="#FFFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M24.0,4.0C13.0,4.0 4.0,13.0 4.0,24.0c0.0,11.0 9.0,20.0 20.0,20.0c11.0,0.0 20.0,-9.0 20.0,-20.0C44.0,13.0 35.0,4.0 24.0,4.0zM24.0,40.0c-8.8,0.0 -16.0,-7.2 -16.0,-16.0c0.0,-3.7 1.3,-7.1 3.4,-9.8l22.4,22.4C31.1,38.7 27.7,40.0 24.0,40.0zM36.6,33.8L14.2,11.4C16.9,9.3 20.3,8.0 24.0,8.0c8.8,0.0 16.0,7.2 16.0,16.0C40.0,27.7 38.7,31.1 36.6,33.8z"/>
 </vector>
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml
index 3b01e029e1c79..705cc34ff62bd 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml
@@ -13,22 +13,18 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="48dp"
-        android:width="48dp" />
-
-    <viewport
+        android:width="48dp"
         android:viewportHeight="480"
-        android:viewportWidth="480" />
+        android:viewportWidth="480" >
 
     <group>
         <path
             android:name="box1"
             android:pathData="m20,200l100,90l180-180l-35-35l-145,145l-60-60l-40,40z"
-            android:fill="?android:attr/colorControlActivated"
-            android:stroke="?android:attr/colorControlActivated"
+            android:fillColor="?android:attr/colorControlActivated"
+            android:strokeColor="?android:attr/colorControlActivated"
             android:strokeLineCap="round"
             android:strokeLineJoin="round" />
     </group>
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable02.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable02.xml
index 40f23f0c4bc1a..f5d647ceaa8f9 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable02.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable02.xml
@@ -12,14 +12,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="64dp"
-        android:height="64dp"/>
-
-    <viewport android:viewportWidth="320"
-          android:viewportHeight="320"/>
+        android:height="64dp" android:viewportWidth="320"
+          android:viewportHeight="320">
     <group
         android:rotation="180"
         android:pivotX="70"
@@ -27,8 +23,8 @@
         <path
             android:name="house"
             android:pathData="M 130,225 L 130,115 L 130,115 L 70,15 L 10,115 L 10,115 L 10,225 z"
-            android:fill="#ff440000"
-            android:stroke="#FF00FF00"
+            android:fillColor="#ff440000"
+            android:strokeColor="#FF00FF00"
             android:strokeWidth="10"
             android:trimPathStart=".1"
             android:trimPathEnd=".9"/>
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable03.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable03.xml
index cd2fd479098d3..a0b0e000d09e4 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable03.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable03.xml
@@ -14,23 +14,17 @@
      limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:autoMirrored="true" >
-
-    <size
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="12.25"
-        android:viewportWidth="7.30625" />
+        android:viewportWidth="7.30625" >
 
     <group
         android:pivotX="3.65"
         android:pivotY="6.125"
         android:rotation="-30" >
-        <path
+        <clip-path
             android:name="clip1"
-            android:clipToPath="true"
             android:pathData="
                 M 0, 6.125
                 l 7.3, 0
@@ -41,7 +35,7 @@
     <group>
         <path
             android:name="one"
-            android:fill="#ff88ff"
+            android:fillColor="#ff88ff"
             android:pathData="M 1.215625,9.5l 1.9375,0.0 0.0-6.671875-2.109375,0.421875 0.0-1.078125
                 l 2.09375-0.421875 1.1874998,0.0 0.0,7.75 1.9375,0.0 0.0,1.0
                 l-5.046875,0.0 0.0-1.0Z" />
@@ -50,9 +44,8 @@
         android:pivotX="3.65"
         android:pivotY="6.125"
         android:rotation="-30" >
-        <path
+        <clip-path
             android:name="clip2"
-            android:clipToPath="true"
             android:pathData="
                 M 0, 0
                 l 7.3, 0
@@ -63,7 +56,7 @@
     <group>
         <path
             android:name="two"
-            android:fill="#ff88ff"
+            android:fillColor="#ff88ff"
             android:pathData="M 2.534375,9.6875l 4.140625,0.0 0.0,1.0-5.5625,0.0 0.0-1.0q 0.671875-0.6875 1.828125-1.859375
                         q 1.1718752-1.1875 1.4687502-1.53125 0.578125-0.625 0.796875-1.0625
                         q 0.234375-0.453125 0.234375-0.875 0.0-0.703125-0.5-1.140625
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable04.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable04.xml
index d57ae8b756efc..5a7f380bda1d1 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable04.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable04.xml
@@ -13,45 +13,33 @@
      limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:autoMirrored="true">
-
-    <size
             android:width="64dp"
-            android:height="64dp"/>
-
-    <viewport
+            android:height="64dp"
             android:viewportWidth="7.30625"
-            android:viewportHeight="12.25"/>
+            android:viewportHeight="12.25">
 
     <group>
-        <path
+        <clip-path
                 android:name="clip1"
                 android:pathData="
                 M 3.65, 6.125
                 m-.001, 0
                 a .001,.001 0 1,0 .002,0
-                a .001,.001 0 1,0-.002,0z"
-                android:clipToPath="true"
-                android:fill="#112233"
-                />
-
+                a .001,.001 0 1,0-.002,0z"/>
         <path
                 android:name="one"
                 android:pathData="M 1.215625,9.5l 1.9375,0.0 0.0-6.671875-2.109375,0.421875 0.0-1.078125
                 l 2.09375-0.421875 1.1874998,0.0 0.0,7.75 1.9375,0.0 0.0,1.0
                 l-5.046875,0.0 0.0-1.0Z"
-                android:fill="#ff88ff"
-                />
-        <path
+                android:fillColor="#ff88ff"/>
+
+        <clip-path
                 android:name="clip2"
                 android:pathData="
                 M 3.65, 6.125
                 m-6, 0
                 a 6,6 0 1,0 12,0
-                a 6,6 0 1,0-12,0z"
-                android:clipToPath="true"
-                android:fill="#112233"
-                />
+                a 6,6 0 1,0-12,0z"/>
         <path
                 android:name="two"
                 android:pathData="M 2.534375,9.6875l 4.140625,0.0 0.0,1.0-5.5625,0.0 0.0-1.0q 0.671875-0.6875 1.828125-1.859375
@@ -63,7 +51,6 @@
                         q 0.8125,0.671875 0.8125,1.8125 0.0,0.53125-0.203125,1.015625
                         q-0.203125,0.484375-0.734375,1.140625-0.15625,0.171875-0.9375,0.984375
                         q-0.78125024,0.8125-2.2187502,2.265625Z"
-                android:fill="#ff88ff"
-                />
+                android:fillColor="#ff88ff"/>
     </group>
 </vector>
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable05.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable05.xml
index 673c465242431..5b1f6abba3d3d 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable05.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable05.xml
@@ -14,26 +14,21 @@
      limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:autoMirrored="true">
-
-    <size
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="12.25"
-        android:viewportWidth="7.30625" />
+        android:viewportWidth="7.30625" >
 
     <group>
         <path
             android:name="one"
-            android:fill="#ffff00"
+            android:fillColor="#ffff00"
             android:pathData="M 1.215625,9.5l 1.9375,0.0 0.0-6.671875-2.109375,0.421875 0.0-1.078125
                 l 2.09375-0.421875 1.1874998,0.0 0.0,7.75 1.9375,0.0 0.0,1.0
                 l-5.046875,0.0 0.0-1.0Z" />
         <path
             android:name="two"
-            android:fill="#ffff00"
+            android:fillColor="#ffff00"
             android:fillOpacity="0"
             android:pathData="M 2.534375,9.6875l 4.140625,0.0 0.0,1.0-5.5625,0.0 0.0-1.0q 0.671875-0.6875 1.828125-1.859375
                         q 1.1718752-1.1875 1.4687502-1.53125 0.578125-0.625 0.796875-1.0625
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable06.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable06.xml
index ab5f7f49ba3a7..98b623572eb7f 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable06.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable06.xml
@@ -12,41 +12,37 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
             android:width="64dp"
-            android:height="64dp"/>
-
-    <viewport
+            android:height="64dp"
             android:viewportWidth="700"
-            android:viewportHeight="700"/>
+            android:viewportHeight="700">
 
     <group>
         <path android:pathData="M 569.374 461.472L 569.374 160.658L 160.658 160.658L 160.658 461.472L 569.374 461.472z"
               android:name="path2451"
-              android:fill="#00000000"
-              android:stroke="#FF000000"
+              android:fillColor="#00000000"
+              android:strokeColor="#FF000000"
               android:strokeWidth="30.65500000000000"/>
         <path android:pathData="M 365.015 311.066"
               android:name="path2453"
-              android:fill="#00000000"
-              android:stroke="#FF000000"
+              android:fillColor="#00000000"
+              android:strokeColor="#FF000000"
               android:strokeWidth="30.655000000000001"/>
         <path android:pathData="M 164.46 164.49L 340.78 343.158C 353.849 356.328 377.63 356.172 390.423 343.278L 566.622 165.928"
               android:name="path2455"
-              android:stroke="#FF000000"
-              android:fill="#FFFFFFFF"
+              android:strokeColor="#FF000000"
+              android:fillColor="#FFFFFFFF"
               android:strokeWidth="30.655000000000001"/>
         <path android:pathData="M 170.515 451.566L 305.61 313.46"
               android:name="path2457"
-              android:fill="#00000000"
-              android:stroke="#000000"
+              android:fillColor="#00000000"
+              android:strokeColor="#000000"
               android:strokeWidth="30.655000000000001"/>
         <path android:pathData="M 557.968 449.974L 426.515 315.375"
               android:name="path2459"
-              android:fill="#00000000"
-              android:stroke="#000000"
+              android:fillColor="#00000000"
+              android:strokeColor="#000000"
               android:strokeWidth="30.655000000000001"/>
     </group>
 </vector>
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable07.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable07.xml
index ccb0df0c9aa86..88c4a1eaea48d 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable07.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable07.xml
@@ -12,13 +12,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"   >
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
             android:width="64dp"
-            android:height="64dp"/>
-
-    <viewport android:viewportWidth="140"
-          android:viewportHeight="110"/>
+            android:height="64dp" android:viewportWidth="140"
+          android:viewportHeight="110">
 
     <group>
         <path
@@ -26,7 +23,7 @@
                 android:pathData="M 20,55 l 35.3-35.3 7.07,7.07-35.3,35.3 z
               M 27,50 l 97,0 0,10-97,0 z
               M 20,55 l 7.07-7.07 35.3,35.3-7.07,7.07 z"
-                android:fill="#ffffffff"
+                android:fillColor="#ffffffff"
                 />
     </group>
 </vector>
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable08.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable08.xml
index 59f745942dc7f..75529e2fd4ed1 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable08.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable08.xml
@@ -12,22 +12,17 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
             android:width="64dp"
-            android:height="64dp"/>
-
-
-    <viewport android:viewportWidth="600"
-          android:viewportHeight="600"/>
+            android:height="64dp" android:viewportWidth="600"
+          android:viewportHeight="600">
 
     <group>
         <path
                 android:name="pie1"
                 android:pathData="M535.441,412.339A280.868,280.868 0 1,1 536.186,161.733L284.493,286.29Z"
-                android:fill="#ffffcc00"
-                android:stroke="#FF00FF00"
+                android:fillColor="#ffffcc00"
+                android:strokeColor="#FF00FF00"
                 android:strokeWidth="1"/>
     </group>
 
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable09.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable09.xml
index 77434fca58f02..853a77000d4c7 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable09.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable09.xml
@@ -13,15 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="200"
-        android:viewportWidth="200" />
+        android:viewportWidth="200" >
 
     <group
         android:pivotX="100"
@@ -29,7 +25,7 @@
         android:rotation="90">
         <path
             android:name="house"
-            android:fill="#ffffffff"
+            android:fillColor="#ffffffff"
             android:pathData="M 100,20 l 0,0 0,140-80,0 z M 100,20 l 0,0 80,140-80,0 z"/>
     </group>
 
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable10.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable10.xml
index df24713e3ba00..83ed194a14e40 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable10.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable10.xml
@@ -14,32 +14,28 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportWidth="200"
-        android:viewportHeight="200"/>
+        android:viewportHeight="200">
 
     <group>
         <path
             android:name="bar3"
-            android:fill="#FFFFFFFF"
+            android:fillColor="#FFFFFFFF"
             android:pathData="M49.001,60c-5.466,0-9.899,4.478-9.899,10s4.434,10,9.899,10c5.468,0,9.899-4.478,9.899-10S54.469,60,49.001,60z" />
         <path
             android:name="bar2"
-            android:fill="#FFFFFFFF"
+            android:fillColor="#FFFFFFFF"
             android:pathData="M28.001,48.787l7,7.07c7.731-7.811,20.269-7.81,28.001,0l6.999-7.07C58.403,37.071,39.599,37.071,28.001,48.787z" />
         <path
             android:name="bar1"
-            android:fill="#FF555555"
+            android:fillColor="#FF555555"
             android:pathData="M14.001,34.645   L21,41.716c15.464-15.621,40.536-15.621,56,0l7.001-7.071C64.672,15.119,33.33,15.119,14.001,34.645z" />
         <path
             android:name="bar0"
-            android:fill="#FF555555"
+            android:fillColor="#FF555555"
             android:pathData="M0,20.502l6.999,7.071   c23.196-23.431,60.806-23.431,84.002,0L98,20.503C70.938-6.834,27.063-6.834,0,20.502z" />
     </group>
 
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable11.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable11.xml
index 3422bbfe9d056..b3d7d8eed3491 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable11.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable11.xml
@@ -13,26 +13,22 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="80"
-        android:viewportWidth="40" />
+        android:viewportWidth="40" >
 
     <group>
         <path
             android:name="battery"
-            android:fill="#3388ff"
+            android:fillColor="#3388ff"
             android:pathData="M 20.28125,2.0000002 C 17.352748,2.0000002 15,4.3527485 15,7.2812502 L 15,8.0000002 L 13.15625,8.0000002 C 9.7507553,8.0000002 7,10.750759 7,14.15625 L 7,39.84375 C 7,43.24924 9.7507558,46 13.15625,46 L 33.84375,46 C 37.249245,46 39.999999,43.24924 40,39.84375 L 40,14.15625 C 40,10.75076 37.249243,8.0000002 33.84375,8.0000002 L 32,8.0000002 L 32,7.2812502 C 32,4.3527485 29.647252,2.0000002 26.71875,2.0000002 L 20.28125,2.0000002 z"
-            android:stroke="#ff8833"
+            android:strokeColor="#ff8833"
             android:strokeWidth="1" />
         <path
             android:name="spark"
-            android:fill="#FFFF0000"
+            android:fillColor="#FFFF0000"
             android:pathData="M 30,18.031528 L 25.579581,23.421071 L 29.370621,26.765348 L 20.096792,37 L 21.156922,28.014053 L 17,24.902844 L 20.880632,18 L 30,18.031528 z" />
     </group>
 
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable12.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable12.xml
index a212defb551c6..2c8b75118dfe9 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable12.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable12.xml
@@ -13,15 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="600"
-        android:viewportWidth="600" />
+        android:viewportWidth="600" >
 
     <group
         android:name="rotationGroup"
@@ -30,16 +26,16 @@
         android:rotation="45.0" >
         <path
             android:name="pie1"
-            android:fill="#00000000"
+            android:fillColor="#00000000"
             android:pathData="M300,70 a230,230 0 1,0 1,0 z"
-            android:stroke="#FF777777"
+            android:strokeColor="#FF777777"
             android:strokeWidth="70"
             android:trimPathEnd=".75"
             android:trimPathOffset="0"
             android:trimPathStart="0" />
         <path
             android:name="v"
-            android:fill="#000000"
+            android:fillColor="#000000"
             android:pathData="M300,70 l 0,-70 70,70 0,0 -70,70z" />
 
         <group
@@ -55,7 +51,7 @@
                 <path
                     android:name="twoLines1"
                     android:pathData="@string/twoLinePathData"
-                    android:stroke="#FFFF0000"
+                    android:strokeColor="#FFFF0000"
                     android:strokeWidth="20" />
 
                 <group
@@ -69,9 +65,9 @@
                         android:rotation="-45.0" >
                         <path
                             android:name="twoLines2"
-                            android:fill="#FF00FF00"
+                            android:fillColor="#FF00FF00"
                             android:pathData="@string/twoLinePathData"
-                            android:stroke="#FF00FF00"
+                            android:strokeColor="#FF00FF00"
                             android:strokeWidth="20" />
 
                         <group
@@ -86,7 +82,7 @@
                                 <path
                                     android:name="twoLines3"
                                     android:pathData="@string/twoLinePathData"
-                                    android:stroke="#FF0000FF"
+                                    android:strokeColor="#FF0000FF"
                                     android:strokeWidth="20" />
                             </group>
                         </group>
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable13.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable13.xml
index 8c946df20d5e7..2468a1b303cb5 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable13.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable13.xml
@@ -13,28 +13,24 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="400"
-        android:viewportWidth="600" />
+        android:viewportWidth="600" >
 
     <group>
         <path
             android:name="pie1"
-            android:fill="#ffffffff"
+            android:fillColor="#ffffffff"
             android:pathData="M300,200 h-150 a150,150 0 1,0 150,-150 z"
-            android:stroke="#FF00FF00"
+            android:strokeColor="#FF00FF00"
             android:strokeWidth="1" />
         <path
             android:name="half"
-            android:fill="#FFFF0000"
+            android:fillColor="#FFFF0000"
             android:pathData="M275,175 v-150 a150,150 0 0,0 -150,150 z"
-            android:stroke="#FF0000FF"
+            android:strokeColor="#FF0000FF"
             android:strokeWidth="5" />
     </group>
 
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable14.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable14.xml
index 8d4ca61f82ab6..01e24d302288f 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable14.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable14.xml
@@ -13,15 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="500"
-        android:viewportWidth="800" />
+        android:viewportWidth="800" >
 
     <group
         android:pivotX="90"
@@ -34,8 +30,8 @@
            a25,25 -30 0,1 100,-50 l 50,-25
            a25,37 -30 0,1 100,-50 l 50,-25
            a25,50 -30 0,1 100,-50 l 50,-25"
-            android:fill="#00000000"
-            android:stroke="#FF00FF00"
+            android:fillColor="#00000000"
+            android:strokeColor="#FF00FF00"
             android:strokeWidth="10" />
     </group>
 
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable15.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable15.xml
index b08e157f00ca2..4bab2e37898ac 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable15.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable15.xml
@@ -13,15 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="400"
-        android:viewportWidth="500" />
+        android:viewportWidth="500" >
 
     <group
         android:pivotX="250"
@@ -29,9 +25,9 @@
         android:rotation="180">
         <path
             android:name="house"
-            android:fill="#ff440000"
+            android:fillColor="#ff440000"
             android:pathData="M100,200 C100,100 250,100 250,200 S400,300 400,200"
-            android:stroke="#FFFF0000"
+            android:strokeColor="#FFFF0000"
             android:strokeWidth="10" />
     </group>
 
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable16.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable16.xml
index ae85d9b14caad..107cda2ca2334 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable16.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable16.xml
@@ -13,25 +13,21 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="200"
-        android:viewportWidth="200" />
+        android:viewportWidth="200" >
 
     <group>
         <path
             android:name="background1"
             android:pathData="M 0,0 l 100,0 l 0, 100 l -100, 0 z"
-            android:fill="#FF000000"/>
+            android:fillColor="#FF000000"/>
         <path
             android:name="background2"
             android:pathData="M 100,100 l 100,0 l 0, 100 l -100, 0 z"
-            android:fill="#FF000000"/>
+            android:fillColor="#FF000000"/>
     </group>
     <group
         android:pivotX="100"
@@ -44,7 +40,7 @@
         <path
             android:name="twoLines"
             android:pathData="M 100,10 v 90 M 10,100 h 90"
-            android:stroke="#FF00FF00"
+            android:strokeColor="#FF00FF00"
             android:strokeWidth="10" />
     </group>
 
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable17.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable17.xml
index c28aff46cd89e..801954986ab79 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable17.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable17.xml
@@ -12,21 +12,17 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
             android:width="64dp"
-            android:height="64dp"/>
-
-    <viewport android:viewportWidth="1200"
-          android:viewportHeight="600"/>
+            android:height="64dp" android:viewportWidth="1200"
+          android:viewportHeight="600">
 
     <group>
         <path
                 android:name="house"
                 android:pathData="M200,300 Q400,50 600,300 T1000,300"
-                android:fill="#00000000"
-                android:stroke="#FFFF0000"
+                android:fillColor="#00000000"
+                android:strokeColor="#FFFF0000"
                 android:strokeWidth="10"/>
     </group>
 
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable18.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable18.xml
index d7042fd0b2baa..c93bdb94f6462 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable18.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable18.xml
@@ -13,22 +13,18 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="400"
-        android:viewportWidth="500" />
+        android:viewportWidth="500" >
 
     <group>
         <path
             android:name="house"
             android:pathData="M100,200 C100,100 250,100 250,200 S400,300 400,200"
-            android:fill="#00000000"
-            android:stroke="#FFFFFF00"
+            android:fillColor="#00000000"
+            android:strokeColor="#FFFFFF00"
             android:strokeWidth="10" />
     </group>
 
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable19.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable19.xml
index 47a9574eb681f..996b6beff8bf5 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable19.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable19.xml
@@ -13,15 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="800"
-        android:viewportWidth="1000" />
+        android:viewportWidth="1000" >
 
     <group>
         <path
@@ -29,8 +25,8 @@
             android:pathData="M10,300 Q400,550 600,300 T1000,300"
             android:pivotX="90"
             android:pivotY="100"
-            android:fill="#00000000"
-            android:stroke="#FFFF0000"
+            android:fillColor="#00000000"
+            android:strokeColor="#FFFF0000"
             android:strokeWidth="60" />
     </group>
 
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable20.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable20.xml
index b8af7e2d076cf..58021446bdc5f 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable20.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable20.xml
@@ -13,25 +13,21 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="480"
-        android:viewportWidth="480" />
+        android:viewportWidth="480" >
 
     <group>
         <path
             android:name="edit"
-            android:fill="#FF00FFFF"
+            android:fillColor="#FF00FFFF"
             android:pathData="M406.667,180c0,0 -100 -100 -113.334 -113.333
     c-13.333 -13.334 -33.333,0 -33.333,0l-160,160c0,0 -40,153.333 -40,173.333c0,13.333,13.333,13.333,13.333,13.333l173.334 -40
     c0,0,146.666 -146.666,160 -160C420,200,406.667,180,406.667,180z M226.399,356.823L131.95,378.62l-38.516 -38.522
     c7.848 -34.675,20.152 -82.52,23.538 -95.593l3.027,2.162l106.667,106.666L226.399,356.823z"
-            android:stroke="#FF000000"
+            android:strokeColor="#FF000000"
             android:strokeWidth="10" />
     </group>
 
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable21.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable21.xml
index e0013e7d28dd4..5626b44e4b507 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable21.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable21.xml
@@ -13,25 +13,21 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="200"
-        android:viewportWidth="200" />
+        android:viewportWidth="200" >
 
     <group>
         <path
             android:name="background1"
             android:pathData="M 0,0 l 100,0 l 0, 100 l -100, 0 z"
-            android:fill="#FF000000"/>
+            android:fillColor="#FF000000"/>
         <path
             android:name="background2"
             android:pathData="M 100,100 l 100,0 l 0, 100 l -100, 0 z"
-            android:fill="#FF000000"/>
+            android:fillColor="#FF000000"/>
     </group>
     <group
         android:pivotX="0"
@@ -44,7 +40,7 @@
         <path
             android:name="twoLines"
             android:pathData="M 100,10 v 90 M 10,100 h 90"
-            android:stroke="#FF00FF00"
+            android:strokeColor="#FF00FF00"
             android:strokeWidth="10" />
     </group>
 
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable22.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable22.xml
index 8d38cb51bf423..5b40d0d070133 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable22.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable22.xml
@@ -13,24 +13,20 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="400"
-        android:viewportWidth="400" />
+        android:viewportWidth="400" >
 
     <group android:name="backgroundGroup" >
         <path
             android:name="background1"
-            android:fill="#80000000"
+            android:fillColor="#80000000"
             android:pathData="M 0,0 l 200,0 l 0, 200 l -200, 0 z" />
         <path
             android:name="background2"
-            android:fill="#80000000"
+            android:fillColor="#80000000"
             android:pathData="M 200,200 l 200,0 l 0, 200 l -200, 0 z" />
     </group>
     <group
@@ -40,7 +36,7 @@
         <path
             android:name="twoLines"
             android:pathData="M 0,0 v 100 M 0,0 h 100"
-            android:stroke="#FFFF0000"
+            android:strokeColor="#FFFF0000"
             android:strokeWidth="20" />
 
         <group
@@ -51,7 +47,7 @@
             <path
                 android:name="twoLines1"
                 android:pathData="M 0,0 v 100 M 0,0 h 100"
-                android:stroke="#FF00FF00"
+                android:strokeColor="#FF00FF00"
                 android:strokeWidth="20" />
 
             <group
@@ -62,7 +58,7 @@
                     <path
                         android:name="twoLines2"
                         android:pathData="M 0,0 v 100 M 0,0 h 100"
-                        android:stroke="#FF0000FF"
+                        android:strokeColor="#FF0000FF"
                         android:strokeWidth="20" />
                 </group>
             </group>
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable23.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable23.xml
index 52acd7afed5a4..6ab6ffd2b1fb7 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable23.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable23.xml
@@ -13,24 +13,20 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="400"
-        android:viewportWidth="400" />
+        android:viewportWidth="400" >
 
     <group android:name="backgroundGroup" >
         <path
             android:name="background1"
-            android:fill="#80000000"
+            android:fillColor="#80000000"
             android:pathData="M 0,0 l 200,0 l 0, 200 l -200, 0 z" />
         <path
             android:name="background2"
-            android:fill="#80000000"
+            android:fillColor="#80000000"
             android:pathData="M 200,200 l 200,0 l 0, 200 l -200, 0 z" />
     </group>
     <group
@@ -40,7 +36,7 @@
         <path
             android:name="twoLines"
             android:pathData="@string/twoLinePathData"
-            android:stroke="#FFFF0000"
+            android:strokeColor="#FFFF0000"
             android:strokeWidth="20" />
 
         <group
@@ -51,7 +47,7 @@
             <path
                 android:name="twoLines1"
                 android:pathData="@string/twoLinePathData"
-                android:stroke="#FF00FF00"
+                android:strokeColor="#FF00FF00"
                 android:strokeWidth="20" />
 
             <group
@@ -62,7 +58,7 @@
                     <path
                         android:name="twoLines3"
                         android:pathData="@string/twoLinePathData"
-                        android:stroke="#FF0000FF"
+                        android:strokeColor="#FF0000FF"
                         android:strokeWidth="20" />
                 </group>
             </group>
@@ -75,8 +71,8 @@
                     <path
                         android:name="twoLines2"
                         android:pathData="@string/twoLinePathData"
-                        android:fill="?android:attr/colorForeground"
-                        android:stroke="?android:attr/colorForeground"
+                        android:fillColor="?android:attr/colorForeground"
+                        android:strokeColor="?android:attr/colorForeground"
                         android:strokeWidth="20" />
                 </group>
             </group>
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable24.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable24.xml
index c062d702f0d8d..5c1ccaa03361a 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable24.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable24.xml
@@ -13,25 +13,21 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="400"
-        android:viewportWidth="400" />
+        android:viewportWidth="400" >
 
     <group android:name="backgroundGroup"
         android:alpha = "0.5" >
         <path
             android:name="background1"
-            android:fill="#FF000000"
+            android:fillColor="#FF000000"
             android:pathData="M 0,0 l 200,0 l 0, 200 l -200, 0 z" />
         <path
             android:name="background2"
-            android:fill="#FF000000"
+            android:fillColor="#FF000000"
             android:pathData="M 200,200 l 200,0 l 0, 200 l -200, 0 z" />
     </group>
     <group
@@ -42,7 +38,7 @@
         <path
             android:name="twoLines"
             android:pathData="@string/twoLinePathData"
-            android:stroke="#FFFF0000"
+            android:strokeColor="#FFFF0000"
             android:strokeWidth="20" />
 
         <group
@@ -54,7 +50,7 @@
             <path
                 android:name="twoLines1"
                 android:pathData="@string/twoLinePathData"
-                android:stroke="#FF00FF00"
+                android:strokeColor="#FF00FF00"
                 android:strokeWidth="20" />
 
             <group
@@ -66,7 +62,7 @@
                     <path
                         android:name="twoLines3"
                         android:pathData="@string/twoLinePathData"
-                        android:stroke="#FF0000FF"
+                        android:strokeColor="#FF0000FF"
                         android:strokeWidth="20" />
                 </group>
             </group>
@@ -80,8 +76,8 @@
                     <path
                         android:name="twoLines2"
                         android:pathData="@string/twoLinePathData"
-                        android:fill="?android:attr/colorForeground"
-                        android:stroke="?android:attr/colorForeground"
+                        android:fillColor="?android:attr/colorForeground"
+                        android:strokeColor="?android:attr/colorForeground"
                         android:strokeWidth="20" />
                 </group>
             </group>
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable25.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable25.xml
index a3f0447875981..069a53154495b 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable25.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable25.xml
@@ -13,15 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="400"
-        android:viewportWidth="400" />
+        android:viewportWidth="400" >
 
     <group
         android:name="FirstLevelGroup"
@@ -34,7 +30,7 @@
             android:translateX="-100.0"
             android:translateY="50.0" >
             <path
-                android:fill="#FF00FF00"
+                android:fillColor="#FF00FF00"
                 android:pathData="@string/rectangle200" />
 
             <group
@@ -43,7 +39,7 @@
                 android:translateX="-100.0"
                 android:translateY="50.0" >
                 <path
-                    android:fill="#FF0000FF"
+                    android:fillColor="#FF0000FF"
                     android:pathData="@string/rectangle200" />
             </group>
             <group
@@ -52,7 +48,7 @@
                 android:translateX="100.0"
                 android:translateY="50.0" >
                 <path
-                    android:fill="#FF000000"
+                    android:fillColor="#FF000000"
                     android:pathData="@string/rectangle200" />
             </group>
         </group>
@@ -62,7 +58,7 @@
             android:translateX="100.0"
             android:translateY="50.0" >
             <path
-                android:fill="#FF0000FF"
+                android:fillColor="#FF0000FF"
                 android:pathData="@string/rectangle200" />
 
             <group
@@ -71,7 +67,7 @@
                 android:translateX="-100.0"
                 android:translateY="50.0" >
                 <path
-                    android:fill="#FFFF0000"
+                    android:fillColor="#FFFF0000"
                     android:pathData="@string/rectangle200" />
             </group>
             <group
@@ -80,13 +76,13 @@
                 android:translateX="100.0"
                 android:translateY="50.0" >
                 <path
-                    android:fill="#FF00FF00"
+                    android:fillColor="#FF00FF00"
                     android:pathData="@string/rectangle200" />
             </group>
         </group>
 
         <path
-            android:fill="#FFFF0000"
+            android:fillColor="#FFFF0000"
             android:pathData="@string/rectangle200" />
     </group>
 
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable_favorite.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable_favorite.xml
index 5a66e2d4bc9ff..7be49a9d9b861 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable_favorite.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable_favorite.xml
@@ -13,15 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="128dp"
-        android:width="128dp" />
-
-    <viewport
+        android:width="128dp"
         android:viewportHeight="480"
-        android:viewportWidth="480" />
+        android:viewportWidth="480" >
 
     <group
         android:name="root"
@@ -29,7 +25,7 @@
         android:translateY="240.0" >
         <path
             android:name="favorite"
-            android:fill="#ff000000"
+            android:fillColor="#ff000000"
             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
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable_grouping_1.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable_grouping_1.xml
index 558de94375a09..7839ad19d0f1f 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable_grouping_1.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable_grouping_1.xml
@@ -13,15 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="256"
-        android:viewportWidth="256" />
+        android:viewportWidth="256" >
 
     <group
         android:name="shape_layer_1"
@@ -30,7 +26,7 @@
         <group android:name="sun" >
             <path
                 android:name="ellipse_path_1"
-                android:fill="#ffff8000"
+                android:fillColor="#ffff8000"
                 android:pathData="m -25 0 a 25,25 0 1,0 50,0 a 25,25 0 1,0 -50,0" />
 
             <group
@@ -38,7 +34,7 @@
                 android:translateX="75" >
                 <path
                     android:name="ellipse_path_1_1"
-                    android:fill="#ff5656ea"
+                    android:fillColor="#ff5656ea"
                     android:pathData="m -10 0 a 10,10 0 1,0 20,0 a 10,10 0 1,0 -20,0" />
 
                 <group
@@ -46,7 +42,7 @@
                     android:translateX="25" >
                     <path
                         android:name="ellipse_path_1_2"
-                        android:fill="#ffadadad"
+                        android:fillColor="#ffadadad"
                         android:pathData="m -5 0 a 5,5 0 1,0 10,0 a 5,5 0 1,0 -10,0" />
                 </group>
             </group>
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable_progress_bar.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable_progress_bar.xml
index f1b2996beab24..4544cae92a316 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_drawable_progress_bar.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_drawable_progress_bar.xml
@@ -13,15 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="64"
-        android:viewportWidth="64" />
+        android:viewportWidth="64" >
 
     <group
         android:name="root"
@@ -37,9 +33,9 @@
             android:rotation="0" >
             <path
                 android:name="pie1"
-                android:fill="#00000000"
+                android:fillColor="#00000000"
                 android:pathData="M0, 0 m 0, -9.5 a 9.5,9.5 0 1,1 0,19 a 9.5,9.5 0 1,1 0,-19"
-                android:stroke="?android:attr/colorControlActivated"
+                android:strokeColor="?android:attr/colorControlActivated"
                 android:strokeLineCap="round"
                 android:strokeLineJoin="miter"
                 android:strokeWidth="2"
diff --git a/tests/VectorDrawableTest/res/drawable/vector_icon_create.xml b/tests/VectorDrawableTest/res/drawable/vector_icon_create.xml
index 22ce795564fcc..0a6cedc5ced12 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_icon_create.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_icon_create.xml
@@ -13,19 +13,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="24"
-        android:viewportWidth="24" />
+        android:viewportWidth="24" >
 
     <group>
         <path
-            android:fill="#FF000000"
+            android:fillColor="#FF000000"
             android:pathData="M3.0,17.25L3.0,21.0l3.75,0.0L17.813995,9.936001l-3.75,-3.75L3.0,17.25zM20.707,7.0429993c0.391,-0.391 0.391,-1.023 0.0,-1.414l-2.336,-2.336c-0.391,-0.391 -1.023,-0.391 -1.414,0.0l-1.832,1.832l3.75,3.75L20.707,7.0429993z" />
     </group>
 
diff --git a/tests/VectorDrawableTest/res/drawable/vector_icon_delete.xml b/tests/VectorDrawableTest/res/drawable/vector_icon_delete.xml
index 042173ca9f9c1..94c10dfd66561 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_icon_delete.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_icon_delete.xml
@@ -13,19 +13,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="24"
-        android:viewportWidth="24" />
+        android:viewportWidth="24" >
 
     <group>
         <path
-            android:fill="#FF000000"
+            android:fillColor="#FF000000"
             android:pathData="M6.0,19.0c0.0,1.104 0.896,2.0 2.0,2.0l8.0,0.0c1.104,0.0 2.0,-0.896 2.0,-2.0l0.0,-12.0L6.0,7.0L6.0,19.0zM18.0,4.0l-2.5,0.0l-1.0,-1.0l-5.0,0.0l-1.0,1.0L6.0,4.0C5.4469986,4.0 5.0,4.4469986 5.0,5.0l0.0,1.0l14.0,0.0l0.0,-1.0C19.0,4.4469986 18.552002,4.0 18.0,4.0z" />
     </group>
 
diff --git a/tests/VectorDrawableTest/res/drawable/vector_icon_heart.xml b/tests/VectorDrawableTest/res/drawable/vector_icon_heart.xml
index 6b6f43de122be..870e508319e22 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_icon_heart.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_icon_heart.xml
@@ -13,19 +13,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="24"
-        android:viewportWidth="24" />
+        android:viewportWidth="24" >
 
     <group>
         <path
-            android:fill="#FF000000"
+            android:fillColor="#FF000000"
             android:pathData="M16.0,5.0c-1.955,0.0 -3.83,1.268 -4.5,3.0c-0.67,-1.732 -2.547,-3.0 -4.5,-3.0C4.4570007,5.0 2.5,6.931999 2.5,9.5c0.0,3.529 3.793,6.258 9.0,11.5c5.207,-5.242 9.0,-7.971 9.0,-11.5C20.5,6.931999 18.543,5.0 16.0,5.0z" />
     </group>
 
diff --git a/tests/VectorDrawableTest/res/drawable/vector_icon_schedule.xml b/tests/VectorDrawableTest/res/drawable/vector_icon_schedule.xml
index ba8ebcad170cc..8cabca86368f9 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_icon_schedule.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_icon_schedule.xml
@@ -13,15 +13,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="24"
-        android:viewportWidth="24" />
+        android:viewportWidth="24" >
 
     <group>
         <path
diff --git a/tests/VectorDrawableTest/res/drawable/vector_icon_settings.xml b/tests/VectorDrawableTest/res/drawable/vector_icon_settings.xml
index 896a9387afe61..7bd6304f78e4e 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_icon_settings.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_icon_settings.xml
@@ -13,19 +13,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="64dp"
-        android:width="64dp" />
-
-    <viewport
+        android:width="64dp"
         android:viewportHeight="24"
-        android:viewportWidth="24" />
+        android:viewportWidth="24" >
 
     <group>
         <path
-            android:fill="#FF000000"
+            android:fillColor="#FF000000"
             android:pathData="M19.429,12.975998c0.042,-0.32 0.07,-0.645 0.07,-0.976s-0.029,-0.655 -0.07,-0.976l2.113,-1.654c0.188,-0.151 0.243,-0.422 0.118,-0.639l-2.0,-3.463c-0.125,-0.217 -0.386,-0.304 -0.612,-0.218l-2.49,1.004c-0.516,-0.396 -1.081,-0.731 -1.69,-0.984l-0.375,-2.648C14.456,2.1829987 14.25,2.0 14.0,2.0l-4.0,0.0C9.75,2.0 9.544,2.1829987 9.506,2.422001L9.131,5.0699997C8.521,5.322998 7.957,5.6570015 7.44,6.054001L4.952,5.0509987C4.726,4.965 4.464,5.052002 4.34,5.269001l-2.0,3.463C2.2150002,8.947998 2.27,9.219002 2.4580002,9.369999l2.112,1.653C4.528,11.344002 4.5,11.668999 4.5,12.0s0.029,0.656 0.071,0.977L2.4580002,14.630001c-0.188,0.151 -0.243,0.422 -0.118,0.639l2.0,3.463c0.125,0.217 0.386,0.304 0.612,0.218l2.489,-1.004c0.516,0.396 1.081,0.731 1.69,0.984l0.375,2.648C9.544,21.817001 9.75,22.0 10.0,22.0l4.0,0.0c0.25,0.0 0.456,-0.183 0.494,-0.422l0.375,-2.648c0.609,-0.253 1.174,-0.588 1.689,-0.984l2.49,1.004c0.226,0.086 0.487,-0.001 0.612,-0.218l2.0,-3.463c0.125,-0.217 0.07,-0.487 -0.118,-0.639L19.429,12.975998zM12.0,16.0c-2.21,0.0 -4.0,-1.791 -4.0,-4.0c0.0,-2.21 1.79,-4.0 4.0,-4.0c2.208,0.0 4.0,1.79 4.0,4.0C16.0,14.209 14.208,16.0 12.0,16.0z" />
     </group>
 
diff --git a/tests/VectorDrawableTest/res/drawable/vector_test01.xml b/tests/VectorDrawableTest/res/drawable/vector_test01.xml
index fc2a15c11b239..dd71ef0e88f5f 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_test01.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_test01.xml
@@ -13,23 +13,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="128dp"
-        android:width="128dp" />
-
-    <viewport
+        android:width="128dp"
         android:viewportHeight="512"
-        android:viewportWidth="512" />
+        android:viewportWidth="512" >
 
     <group>
         <path
             android:name="002b"
             android:pathData="M100,200c0,-100 150,-100 150,0s150,100 150,0t-200,299"
-            android:stroke="#FF0000FF"
+            android:strokeColor="#FF0000FF"
             android:strokeWidth="4"
-            android:fill="#00000000" />
+            android:fillColor="#00000000" />
     </group>
 
 </vector>
\ No newline at end of file
diff --git a/tests/VectorDrawableTest/res/drawable/vector_test02.xml b/tests/VectorDrawableTest/res/drawable/vector_test02.xml
index 9f4abbff5d919..e4f48de862fa4 100644
--- a/tests/VectorDrawableTest/res/drawable/vector_test02.xml
+++ b/tests/VectorDrawableTest/res/drawable/vector_test02.xml
@@ -13,23 +13,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <size
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:height="128dp"
-        android:width="128dp" />
-
-    <viewport
+        android:width="128dp"
         android:viewportHeight="512"
-        android:viewportWidth="512" />
+        android:viewportWidth="512" >
 
     <group>
         <path
             android:name="002b"
             android:pathData="M100,200c0,-100 150,-100 150,0s150,100 150,0T-200,299"
-            android:stroke="#FF0000FF"
+            android:strokeColor="#FF0000FF"
             android:strokeWidth="4"
-            android:fill="#00000000" />
+            android:fillColor="#00000000" />
     </group>
 
 </vector>
\ No newline at end of file