Merge "Getting the version information into the VectorDrawable" (2766e37d) · Commits · e / os / android_frameworks_base

core/res/res/values/attrs.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -4556,6 +4556,7 @@
		<enum name="state_activated" value="8" />
		<enum name="state_window_focused" value="9" />
		</attr>
		<attr name="versionCode" />
		</declare-styleable>

		<!-- Define the virtual size of the drawing surface paths will draw to. -->

+14 −2

Original line number	Diff line number	Diff line
		@@ -60,9 +60,11 @@ import java.util.HashSet;
		* The vector drawable has 6 elements:
		* <p/>
		* <dl>
		* <dt><code><vector></code></dt><dd>
		* The attribute <code>android:trigger</code> which defines a state change that
		* <dt><code><vector></code></dt>
		* <dd> * The attribute <code>android:trigger</code> defines a state change that
		* will drive the animation </dd>
		* <dd> * The attribute <code>android:versionCode</code> defines the version of
		* VectorDrawable </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>
		@@ -494,6 +496,16 @@ public class VectorDrawable extends Drawable {
		} else if (SHAPE_VECTOR.equals(tagName)) {
		TypedArray a = res.obtainAttributes(attrs, R.styleable.VectorDrawable);
		animatedPath.setTrigger(a.getInteger(R.styleable.VectorDrawable_trigger, 0));

		// 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".
		int versionCode = a.getInt(R.styleable.VectorDrawable_versionCode, 1);
		if (versionCode != 1) {
		throw new IllegalArgumentException(
		"So far, VectorDrawable only support version 1");
		}

		a.recycle();
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		limitations under the License.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:trigger="state_checked" >
		android:trigger="state_checked" android:versionCode="1" >

		<size
		android:height="64dp"