commit 77bc0a17e8668945548f3b4936e4888ec3eb189e
author ztenghui <ztenghui@google.com> Mon May 19 22:13:36 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 19 22:13:36 2014 +0000
tree 491605ebb8dad36c98a34bd556a8bfac68322365
parent 6f775255c82a1a1547f31188657722be392cc830
parent e3c45e7a6b2a7d2176aa46ee482e299b54feeb9f

Merge "Remove the versionCode"

core/res/res/values/attrs.xml

diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 9fba1bf..51dff74 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -4753,11 +4753,6 @@
     <!-- ========================== -->
     <eat-comment />
 
-    <!-- Drawable used to draw Vector Drawables. -->
-    <declare-styleable name="VectorDrawable">
-        <attr name="versionCode" />
-    </declare-styleable>
-
     <!-- Define the virtual size of the drawing surface paths will draw to. -->
     <declare-styleable name="VectorDrawableViewport">
         <!-- The width of the canvas the drawing is on. -->

graphics/java/android/graphics/drawable/VectorDrawable.java

diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java
index 05658f5..e3ed75e 100644
--- a/graphics/java/android/graphics/drawable/VectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/VectorDrawable.java
@@ -50,8 +50,7 @@
  * <p/>
  * <dl>
  * <dt><code>&lt;vector></code></dt>
- * <dd>The attribute <code>android:versionCode</code> defines the version of
- * VectorDrawable</dd>
+ * <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>
@@ -284,20 +283,6 @@
                 } else if (SHAPE_VIEWPORT.equals(tagName)) {
                     pathRenderer.parseViewport(res, attrs);
                     noViewportTag = false;
-                } else if (SHAPE_VECTOR.equals(tagName)) {
-                    final TypedArray a = res.obtainAttributes(attrs, R.styleable.VectorDrawable);
-
-                    // Parsing the version information.
-                    // Right now, we only support version "1".
-                    // If the xml didn't specify the version number, the default
-                    // version is "1".
-                    final int versionCode = a.getInt(R.styleable.VectorDrawable_versionCode, 1);
-                    if (versionCode != 1) {
-                        throw new IllegalArgumentException(
-                                "So far, VectorDrawable only support version 1");
-                    }
-
-                    a.recycle();
                 }
             }