Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 177dffd8 authored by ztenghui's avatar ztenghui
Browse files

Getting the version information into the VectorDrawable 

This will allow version controling for later API improvement.
We will only support version 1 so far.

Change-Id: I322e63f6cff157ebb6df5d80625c39bf96ff3659
parent 30cac644

core/res/res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -4555,6 +4555,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. -->

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

+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>&lt;vector></code></dt><dd>

 * The attribute <code>android:trigger</code> which defines a state change that

 * <dt><code>&lt;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>&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>
@@ -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();

                }

            }

tests/DynamicDrawableTest/res/drawable/vector_drawable01.xml

+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"