diff options
| author | ztenghui <ztenghui@google.com> | 2014-05-19 09:27:26 -0700 |
|---|---|---|
| committer | ztenghui <ztenghui@google.com> | 2014-05-19 13:22:10 -0700 |
| commit | e3c45e7a6b2a7d2176aa46ee482e299b54feeb9f (patch) | |
| tree | d306d0dc0cd07d0aca9ab9fe5f408878c0cadda0 | |
| parent | 50a2fb9ea743b1d23ece0d744ae9c2886286039d (diff) | |
| download | frameworks_base-e3c45e7a6b2a7d2176aa46ee482e299b54feeb9f.zip frameworks_base-e3c45e7a6b2a7d2176aa46ee482e299b54feeb9f.tar.gz frameworks_base-e3c45e7a6b2a7d2176aa46ee482e299b54feeb9f.tar.bz2 | |
Remove the versionCode
Change-Id: I2a77fefd7b14fd3bef0b0c7a142fe88e69883c75
| -rw-r--r-- | core/res/res/values/attrs.xml | 5 | ||||
| -rw-r--r-- | graphics/java/android/graphics/drawable/VectorDrawable.java | 17 |
2 files changed, 1 insertions, 21 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 0b83ad6..5e9e8d1 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -4710,11 +4710,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. --> diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java index 2da8615..65d4e48 100644 --- a/graphics/java/android/graphics/drawable/VectorDrawable.java +++ b/graphics/java/android/graphics/drawable/VectorDrawable.java @@ -50,8 +50,7 @@ import java.util.HashMap; * <p/> * <dl> * <dt><code><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><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 @@ public class VectorDrawable extends Drawable { } 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(); } } |