Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove the group tag."

Browse Source
This commit is contained in:
ztenghui
2014-05-12 22:41:43 +00:00
committed by Android (Google) Code Review
parent 1796635f7f 46e546c28f
commit b7869fb3ff
28 changed files with 344 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
graphics/java/android/graphics/drawable/VectorDrawable.java
View File

@@ -46,7 +46,7 @@ import java.util.HashMap;
* This lets you create a drawable based on an XML vector graphic It can be
* defined in an XML file with the <code>&lt;vector></code> element.
* <p/>
* The vector drawable has 6 elements:
* The vector drawable has the following elements:
* <p/>
* <dl>
* <dt><code>&lt;vector></code></dt>
@@ -59,15 +59,15 @@ import java.util.HashMap;
* <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>
* <dt><code>&lt;group></code></dt>
* <dd>Defines the static 2D image.</dd>
* <dt><code>&lt;path></code></dt>
* <dd>Defines paths to be drawn. The path elements must be within a group
* <dd>Defines paths to be drawn. Multiple paths can be defined in one xml file.
* The paths are drawn in the order of their definition order.
* <dl>
* <dt><code>android:name</code>
* <dd>Defines the name of the path.</dd></dt>
* <dt><code>android:pathData</code>
* <dd>Defines path string.</dd></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>
@@ -108,7 +108,6 @@ public class VectorDrawable extends Drawable {
private static final String SHAPE_SIZE = "size";
private static final String SHAPE_VIEWPORT = "viewport";
private static final String SHAPE_GROUP = "group";
private static final String SHAPE_PATH = "path";
private static final String SHAPE_VECTOR = "vector";
@@ -266,10 +265,9 @@ public class VectorDrawable extends Drawable {
boolean noSizeTag = true;
boolean noViewportTag = true;
boolean noGroupTag = true;
boolean noPathTag = true;
VGroup currentGroup = null;
VGroup currentGroup = new VGroup();
int eventType = parser.getEventType();
while (eventType != XmlPullParser.END_DOCUMENT) {
@@ -286,10 +284,6 @@ public class VectorDrawable extends Drawable {
} else if (SHAPE_VIEWPORT.equals(tagName)) {
pathRenderer.parseViewport(res, attrs);
noViewportTag = false;
} else if (SHAPE_GROUP.equals(tagName)) {
currentGroup = new VGroup();
pathRenderer.mGroupList.add(currentGroup);
noGroupTag = false;
} else if (SHAPE_VECTOR.equals(tagName)) {
final TypedArray a = res.obtainAttributes(attrs, R.styleable.VectorDrawable);
@@ -310,7 +304,7 @@ public class VectorDrawable extends Drawable {
eventType = parser.next();
}
if (noSizeTag || noViewportTag || noGroupTag || noPathTag) {
if (noSizeTag || noViewportTag || noPathTag) {
final StringBuffer tag = new StringBuffer();
if (noSizeTag) {
@@ -324,13 +318,6 @@ public class VectorDrawable extends Drawable {
tag.append(SHAPE_SIZE);
}
if (noGroupTag) {
if (tag.length() > 0) {
tag.append(" & ");
}
tag.append(SHAPE_GROUP);
}
if (noPathTag) {
if (tag.length() > 0) {
tag.append(" or ");
@@ -341,6 +328,7 @@ public class VectorDrawable extends Drawable {
throw new XmlPullParserException("no " + tag + " defined");
}
pathRenderer.mCurrentGroup = currentGroup;
// post parse cleanup
pathRenderer.parseFinish();
return pathRenderer;
@@ -394,7 +382,7 @@ public class VectorDrawable extends Drawable {
private Paint mFillPaint;
private PathMeasure mPathMeasure;
final ArrayList<VGroup> mGroupList = new ArrayList<VGroup>();
private VGroup mCurrentGroup = new VGroup();
float mBaseWidth = 1;
float mBaseHeight = 1;
@@ -405,7 +393,7 @@ public class VectorDrawable extends Drawable {
}
public VPathRenderer(VPathRenderer copy) {
mGroupList.addAll(copy.mGroupList);
mCurrentGroup = copy.mCurrentGroup;
if (copy.mCurrentPaths != null) {
mCurrentPaths = new VPath[copy.mCurrentPaths.length];
for (int i = 0; i < mCurrentPaths.length; i++) {
@@ -420,32 +408,24 @@ public class VectorDrawable extends Drawable {
}
public boolean canApplyTheme() {
final ArrayList<VGroup> groups = mGroupList;
for (int i = groups.size() - 1; i >= 0; i--) {
final ArrayList<VPath> paths = groups.get(i).mVGList;
for (int j = paths.size() - 1; j >= 0; j--) {
final VPath path = paths.get(j);
if (path.canApplyTheme()) {
return true;
}
final ArrayList<VPath> paths = mCurrentGroup.mVGList;
for (int j = paths.size() - 1; j >= 0; j--) {
final VPath path = paths.get(j);
if (path.canApplyTheme()) {
return true;
}
}
return false;
}
public void applyTheme(Theme t) {
final ArrayList<VGroup> groups = mGroupList;
for (int i = groups.size() - 1; i >= 0; i--) {
final ArrayList<VPath> paths = groups.get(i).mVGList;
for (int j = paths.size() - 1; j >= 0; j--) {
final VPath path = paths.get(j);
if (path.canApplyTheme()) {
path.applyTheme(t);
}
final ArrayList<VPath> paths = mCurrentGroup.mVGList;
for (int j = paths.size() - 1; j >= 0; j--) {
final VPath path = paths.get(j);
if (path.canApplyTheme()) {
path.applyTheme(t);
}
}
}
public void draw(Canvas canvas, int w, int h) {
@@ -537,11 +517,11 @@ public class VectorDrawable extends Drawable {
}
/**
* Build the "current" path based on the first group
* Build the "current" path based on the current group
* TODO: improve memory use & performance or move to C++
*/
public void parseFinish() {
final Collection<VPath> paths = mGroupList.get(0).getPaths();
final Collection<VPath> paths = mCurrentGroup.getPaths();
mCurrentPaths = paths.toArray(new VPath[paths.size()]);
for (int i = 0; i < mCurrentPaths.length; i++) {
mCurrentPaths[i] = new VPath(mCurrentPaths[i]);

19
tests/VectorDrawableTest/res/drawable/vector_drawable01.xml
View File

@@ -24,13 +24,12 @@
android:viewportHeight="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:strokeLineCap="round"
android:strokeLineJoin="round" />
</group>
</vector>
<path
android:name="box1"
android:fill="?android:attr/colorControlActivated"
android:pathData="m20,200l100,90l180,-180l-35,-35l-145,145l-60,-60l-40,40z"
android:stroke="?android:attr/colorControlActivated"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
</vector>

39
tests/VectorDrawableTest/res/drawable/vector_drawable02.xml
View File

@@ -1,4 +1,5 @@
<!-- Copyright (C) 2014 The Android Open Source Project
<!--
Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,23 +16,23 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" >
<size
android:width="64dp"
android:height="64dp"/>
android:height="64dp"
android:width="64dp" />
<viewport android:viewportWidth="320"
android:viewportHeight="320"/>
<viewport
android:viewportHeight="320"
android:viewportWidth="320" />
<group>
<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:strokeWidth="10"
android:rotation="180"
android:pivotX="70"
android:pivotY="120"
android:trimPathStart=".1"
android:trimPathEnd=".9"/>
</group>
</vector>
<path
android:name="house"
android:fill="#ff440000"
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:pivotX="70"
android:pivotY="120"
android:rotation="180"
android:stroke="#FF00FF00"
android:strokeWidth="10"
android:trimPathEnd=".9"
android:trimPathStart=".1" />
</vector>

69
tests/VectorDrawableTest/res/drawable/vector_drawable03.xml
View File

@@ -1,4 +1,5 @@
<!-- Copyright (C) 2014 The Android Open Source Project
<!--
Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,51 +16,47 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" >
<size
android:width="64dp"
android:height="64dp"/>
android:height="64dp"
android:width="64dp" />
<viewport
android:viewportWidth="7.30625"
android:viewportHeight="12.25"/>
android:viewportHeight="12.25"
android:viewportWidth="7.30625" />
<group>
<path
android:name="clip1"
android:pathData="
<path
android:name="clip1"
android:clipToPath="true"
android:pathData="
M 0, 0
l 7.3, 0
l 0, 0
l -7.3, 0
z"
android:clipToPath="true"
android:rotation="-30"
android:pivotX="3.65"
android:pivotY="6.125"
/>
<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
android:pivotX="3.65"
android:pivotY="6.125"
android:rotation="-30" />
<path
android:name="one"
android:fill="#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"
android:fill="#ff88ff"
/>
<path
android:name="clip2"
android:pathData="
l -5.046875,0.0 0.0,-1.0Z" />
<path
android:name="clip2"
android:clipToPath="true"
android:pathData="
M 0, 0
l 7.3, 0
l 0, 12.25
l -7.3, 0
z"
android:clipToPath="true"
android:rotation="-30"
android:pivotX="3.65"
android:pivotY="6.125"
/>
<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
android:pivotX="3.65"
android:pivotY="6.125"
android:rotation="-30" />
<path
android:name="two"
android:fill="#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
q -0.484375,-0.4375 -1.2656252,-0.4375 -0.5625,0.0 -1.1875,0.1875
@@ -67,8 +64,6 @@
q 0.625,-0.15625 1.140625,-0.15625 1.3593752,0.0 2.1718752,0.6875
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"
/>
</group>
</vector>
q -0.78125024,0.8125 -2.2187502,2.265625Z" />
</vector>

67
tests/VectorDrawableTest/res/drawable/vector_drawable04.xml
View File

@@ -1,4 +1,5 @@
<!-- Copyright (C) 2014 The Android Open Source Project
<!--
Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -12,48 +13,44 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android">
<vector xmlns:android="http://schemas.android.com/apk/res/android" >
<size
android:width="64dp"
android:height="64dp"/>
android:height="64dp"
android:width="64dp" />
<viewport
android:viewportWidth="7.30625"
android:viewportHeight="12.25"/>
android:viewportHeight="12.25"
android:viewportWidth="7.30625" />
<group>
<path
android:name="clip1"
android:pathData="
<path
android:name="clip1"
android:clipToPath="true"
android:fill="#112233"
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"
/>
<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
a .001,.001 0 1,0 -.002,0z" />
<path
android:name="one"
android:fill="#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"
android:fill="#ff88ff"
/>
<path
android:name="clip2"
android:pathData="
l -5.046875,0.0 0.0,-1.0Z" />
<path
android:name="clip2"
android:clipToPath="true"
android:fill="#112233"
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"
/>
<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
a 6,6 0 1,0 -12,0z" />
<path
android:name="two"
android:fill="#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
q -0.484375,-0.4375 -1.2656252,-0.4375 -0.5625,0.0 -1.1875,0.1875
@@ -61,8 +58,6 @@
q 0.625,-0.15625 1.140625,-0.15625 1.3593752,0.0 2.1718752,0.6875
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"
/>
</group>
</vector>
q -0.78125024,0.8125 -2.2187502,2.265625Z" />
</vector>

21
tests/VectorDrawableTest/res/drawable/vector_drawable05.xml
View File

@@ -23,18 +23,17 @@
android:viewportHeight="12.25"
android:viewportWidth="7.30625" />
<group>
<path
android:name="one"
android:fill="#ffff00"
android:pathData="M 1.215625,9.5l 1.9375,0.0 0.0,-6.671875 -2.109375,0.421875 0.0,-1.078125
<path
android:name="one"
android:fill="#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: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
<path
android:name="two"
android:fill="#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
q 0.234375,-0.453125 0.234375,-0.875 0.0,-0.703125 -0.5,-1.140625
q -0.484375,-0.4375 -1.2656252,-0.4375 -0.5625,0.0 -1.1875,0.1875
@@ -43,5 +42,5 @@
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" />
</group>
</vector>

63
tests/VectorDrawableTest/res/drawable/vector_drawable06.xml
View File

@@ -1,4 +1,5 @@
<!-- Copyright (C) 2014 The Android Open Source Project
<!--
Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,34 +16,38 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" >
<size
android:width="64dp"
android:height="64dp"/>
android:height="64dp"
android:width="64dp" />
<viewport
android:viewportWidth="700"
android:viewportHeight="700"/>
android:viewportHeight="700"
android:viewportWidth="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:stroke="#FF000000"
android:strokeWidth="30.65500000000000"/>
<path android:pathData="M 365.015 311.066"
android:name="path2453"
android:stroke="#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:strokeWidth="30.655000000000001"/>
<path android:pathData="M 170.515 451.566L 305.61 313.46"
android:name="path2457"
android:stroke="#000000"
android:strokeWidth="30.655000000000001"/>
<path android:pathData="M 557.968 449.974L 426.515 315.375"
android:name="path2459"
android:stroke="#000000"
android:strokeWidth="30.655000000000001"/>
</group>
</vector>
<path
android:name="path2451"
android:pathData="M 569.374 461.472L 569.374 160.658L 160.658 160.658L 160.658 461.472L 569.374 461.472z"
android:stroke="#FF000000"
android:strokeWidth="30.65500000000000" />
<path
android:name="path2453"
android:pathData="M 365.015 311.066"
android:stroke="#FF000000"
android:strokeWidth="30.655000000000001" />
<path
android:name="path2455"
android:fill="#FFFFFFFF"
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:stroke="#FF000000"
android:strokeWidth="30.655000000000001" />
<path
android:name="path2457"
android:pathData="M 170.515 451.566L 305.61 313.46"
android:stroke="#000000"
android:strokeWidth="30.655000000000001" />
<path
android:name="path2459"
android:pathData="M 557.968 449.974L 426.515 315.375"
android:stroke="#000000"
android:strokeWidth="30.655000000000001" />
</vector>

31
tests/VectorDrawableTest/res/drawable/vector_drawable07.xml
View File

@@ -1,4 +1,5 @@
<!-- Copyright (C) 2014 The Android Open Source Project
<!--
Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -12,21 +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" >
<vector xmlns:android="http://schemas.android.com/apk/res/android" >
<size
android:width="64dp"
android:height="64dp"/>
android:height="64dp"
android:width="64dp" />
<viewport android:viewportWidth="140"
android:viewportHeight="110"/>
<viewport
android:viewportHeight="110"
android:viewportWidth="140" />
<group>
<path
android:name="back"
android:pathData="M 20,55 l 35.3,-35.3 7.07,7.07 -35.3,35.3 z
<path
android:name="back"
android:fill="#ffffffff"
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"
/>
</group>
</vector>
M 20,55 l 7.07,-7.07 35.3,35.3 -7.07,7.07 z" />
</vector>

29
tests/VectorDrawableTest/res/drawable/vector_drawable08.xml
View File

@@ -1,4 +1,5 @@
<!-- Copyright (C) 2014 The Android Open Source Project
<!--
Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,20 +16,18 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" >
<size
android:width="64dp"
android:height="64dp"/>
android:height="64dp"
android:width="64dp" />
<viewport
android:viewportHeight="600"
android:viewportWidth="600" />
<viewport android:viewportWidth="600"
android:viewportHeight="600"/>
<path
android:name="pie1"
android:fill="#ffffcc00"
android:pathData="M535.441,412.339A280.868,280.868 0 1,1 536.186,161.733L284.493,286.29Z"
android:stroke="#FF00FF00"
android:strokeWidth="1" />
<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:strokeWidth="1"/>
</group>
</vector>
</vector>

16
tests/VectorDrawableTest/res/drawable/vector_drawable09.xml
View File

@@ -23,14 +23,12 @@
android:viewportHeight="200"
android:viewportWidth="200" />
<group>
<path
android:name="house"
android:fill="#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"
android:pivotX="100"
android:pivotY="100"
android:rotation="90" />
</group>
<path
android:name="house"
android:fill="#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"
android:pivotX="100"
android:pivotY="100"
android:rotation="90" />
</vector>

38
tests/VectorDrawableTest/res/drawable/vector_drawable10.xml
View File

@@ -21,26 +21,24 @@
android:width="64dp" />
<viewport
android:viewportWidth="200"
android:viewportHeight="200"/>
android:viewportHeight="200"
android:viewportWidth="200" />
<group>
<path
android:name="bar3"
android:fill="#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: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: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: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>
<path
android:name="bar3"
android:fill="#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: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: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: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" />
</vector>

24
tests/VectorDrawableTest/res/drawable/vector_drawable11.xml
View File

@@ -23,18 +23,16 @@
android:viewportHeight="80"
android:viewportWidth="40" />
<group>
<path
android:name="battery"
android:fill="#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:rotation="0"
android:stroke="#ff8833"
android:strokeWidth="1" />
<path
android:name="spark"
android:fill="#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>
<path
android:name="battery"
android:fill="#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:rotation="0"
android:stroke="#ff8833"
android:strokeWidth="1" />
<path
android:name="spark"
android:fill="#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" />
</vector>

32
tests/VectorDrawableTest/res/drawable/vector_drawable12.xml
View File

@@ -23,22 +23,20 @@
android:viewportHeight="600"
android:viewportWidth="600" />
<group>
<path
android:name="pie1"
android:pathData="M300,70 a230,230 0 1,0 1,0 z"
android:stroke="#FF00FF00"
android:strokeWidth="70"
android:trimPathEnd=".75"
android:trimPathOffset="0"
android:trimPathStart="0" />
<path
android:name="v"
android:fill="#FF00FF00"
android:pathData="M300,70 l 0,-70 70,70 -70,70z"
android:pivotX="300"
android:pivotY="300"
android:rotation="0" />
</group>
<path
android:name="pie1"
android:pathData="M300,70 a230,230 0 1,0 1,0 z"
android:stroke="#FF00FF00"
android:strokeWidth="70"
android:trimPathEnd=".75"
android:trimPathOffset="0"
android:trimPathStart="0" />
<path
android:name="v"
android:fill="#FF00FF00"
android:pathData="M300,70 l 0,-70 70,70 -70,70z"
android:pivotX="300"
android:pivotY="300"
android:rotation="0" />
</vector>

32
tests/VectorDrawableTest/res/drawable/vector_drawable13.xml
View File

@@ -23,22 +23,20 @@
android:viewportHeight="400"
android:viewportWidth="600" />
<group>
<path
android:name="pie1"
android:fill="#ffffffff"
android:pathData="M300,200 h-150 a150,150 0 1,0 150,-150 z"
android:stroke="#FF00FF00"
android:strokeWidth="1" />
<path
android:name="half"
android:fill="#FFFF0000"
android:pathData="M275,175 v-150 a150,150 0 0,0 -150,150 z"
android:pivotX="300"
android:pivotY="200"
android:rotation="0"
android:stroke="#FF0000FF"
android:strokeWidth="5" />
</group>
<path
android:name="pie1"
android:fill="#ffffffff"
android:pathData="M300,200 h-150 a150,150 0 1,0 150,-150 z"
android:stroke="#FF00FF00"
android:strokeWidth="1" />
<path
android:name="half"
android:fill="#FFFF0000"
android:pathData="M275,175 v-150 a150,150 0 0,0 -150,150 z"
android:pivotX="300"
android:pivotY="200"
android:rotation="0"
android:stroke="#FF0000FF"
android:strokeWidth="5" />
</vector>

18
tests/VectorDrawableTest/res/drawable/vector_drawable14.xml
View File

@@ -23,19 +23,17 @@
android:viewportHeight="500"
android:viewportWidth="800" />
<group>
<path
android:name="pie2"
android:pathData="M200,350 l 50,-25
<path
android:name="pie2"
android:pathData="M200,350 l 50,-25
a25,12 -30 0,1 100,-50 l 50,-25
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:pivotX="90"
android:pivotY="100"
android:rotation="20"
android:stroke="#FF00FF00"
android:strokeWidth="10" />
</group>
android:pivotX="90"
android:pivotY="100"
android:rotation="20"
android:stroke="#FF00FF00"
android:strokeWidth="10" />
</vector>

20
tests/VectorDrawableTest/res/drawable/vector_drawable15.xml
View File

@@ -23,16 +23,14 @@
android:viewportHeight="400"
android:viewportWidth="500" />
<group>
<path
android:name="house"
android:fill="#ff440000"
android:pathData="M100,200 C100,100 250,100 250,200 S400,300 400,200"
android:pivotX="250"
android:pivotY="200"
android:rotation="180"
android:stroke="#FFFF0000"
android:strokeWidth="10" />
</group>
<path
android:name="house"
android:fill="#ff440000"
android:pathData="M100,200 C100,100 250,100 250,200 S400,300 400,200"
android:pivotX="250"
android:pivotY="200"
android:rotation="180"
android:stroke="#FFFF0000"
android:strokeWidth="10" />
</vector>

18
tests/VectorDrawableTest/res/drawable/vector_drawable16.xml
View File

@@ -23,15 +23,13 @@
android:viewportHeight="200"
android:viewportWidth="200" />
<group>
<path
android:name="house"
android:pathData="M 100,10 v 90 M 10,100 h 90"
android:pivotX="100"
android:pivotY="100"
android:rotation="360"
android:stroke="#FF00FF00"
android:strokeWidth="10" />
</group>
<path
android:name="house"
android:pathData="M 100,10 v 90 M 10,100 h 90"
android:pivotX="100"
android:pivotY="100"
android:rotation="360"
android:stroke="#FF00FF00"
android:strokeWidth="10" />
</vector>

32
tests/VectorDrawableTest/res/drawable/vector_drawable17.xml
View File

@@ -1,4 +1,5 @@
<!-- Copyright (C) 2014 The Android Open Source Project
<!--
Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,21 +16,20 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" >
<size
android:width="64dp"
android:height="64dp"/>
android:height="64dp"
android:width="64dp" />
<viewport android:viewportWidth="1200"
android:viewportHeight="600"/>
<viewport
android:viewportHeight="600"
android:viewportWidth="1200" />
<group>
<path
android:name="house"
android:pathData="M200,300 Q400,50 600,300 T1000,300"
android:stroke="#FFFF0000"
android:strokeWidth="10"
android:rotation="360"
android:pivotX="600"
android:pivotY="300"/>
</group>
<path
android:name="house"
android:pathData="M200,300 Q400,50 600,300 T1000,300"
android:pivotX="600"
android:pivotY="300"
android:rotation="360"
android:stroke="#FFFF0000"
android:strokeWidth="10" />
</vector>
</vector>

18
tests/VectorDrawableTest/res/drawable/vector_drawable18.xml
View File

@@ -23,15 +23,13 @@
android:viewportHeight="400"
android:viewportWidth="500" />
<group>
<path
android:name="house"
android:pathData="M100,200 C100,100 250,100 250,200 S400,300 400,200"
android:pivotX="250"
android:pivotY="200"
android:rotation="360"
android:stroke="#FFFFFF00"
android:strokeWidth="10" />
</group>
<path
android:name="house"
android:pathData="M100,200 C100,100 250,100 250,200 S400,300 400,200"
android:pivotX="250"
android:pivotY="200"
android:rotation="360"
android:stroke="#FFFFFF00"
android:strokeWidth="10" />
</vector>

16
tests/VectorDrawableTest/res/drawable/vector_drawable19.xml
View File

@@ -23,14 +23,12 @@
android:viewportHeight="800"
android:viewportWidth="1000" />
<group>
<path
android:name="house"
android:pathData="M10,300 Q400,550 600,300 T1000,300"
android:pivotX="90"
android:pivotY="100"
android:stroke="#FFFF0000"
android:strokeWidth="60" />
</group>
<path
android:name="house"
android:pathData="M10,300 Q400,550 600,300 T1000,300"
android:pivotX="90"
android:pivotY="100"
android:stroke="#FFFF0000"
android:strokeWidth="60" />
</vector>

14
tests/VectorDrawableTest/res/drawable/vector_drawable20.xml
View File

@@ -23,16 +23,14 @@
android:viewportHeight="480"
android:viewportWidth="480" />
<group>
<path
android:name="edit"
android:fill="#FF00FFFF"
android:pathData="M406.667,180c0,0 -100 -100 -113.334 -113.333
<path
android:name="edit"
android:fill="#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:strokeWidth="10" />
</group>
android:stroke="#FF000000"
android:strokeWidth="10" />
</vector>

8
tests/VectorDrawableTest/res/drawable/vector_icon_create.xml
View File

@@ -23,10 +23,8 @@ limitations under the License.
android:viewportHeight="24"
android:viewportWidth="24" />
<group>
<path
android:fill="#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>
<path
android:fill="#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" />
</vector>

8
tests/VectorDrawableTest/res/drawable/vector_icon_delete.xml
View File

@@ -23,10 +23,8 @@ limitations under the License.
android:viewportHeight="24"
android:viewportWidth="24" />
<group>
<path
android:fill="#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>
<path
android:fill="#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" />
</vector>

8
tests/VectorDrawableTest/res/drawable/vector_icon_heart.xml
View File

@@ -23,10 +23,8 @@ limitations under the License.
android:viewportHeight="24"
android:viewportWidth="24" />
<group>
<path
android:fill="#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>
<path
android:fill="#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" />
</vector>

14
tests/VectorDrawableTest/res/drawable/vector_icon_schedule.xml
View File

@@ -23,13 +23,11 @@ limitations under the License.
android:viewportHeight="24"
android:viewportWidth="24" />
<group>
<path
android:fillOpacity="0.9"
android:pathData="M11.994999,2.0C6.4679985,2.0 2.0,6.4780006 2.0,12.0s4.468,10.0 9.995,10.0S22.0,17.522 22.0,12.0S17.521,2.0 11.994999,2.0zM12.0,20.0c-4.42,0.0 -8.0,-3.582 -8.0,-8.0s3.58,-8.0 8.0,-8.0s8.0,3.582 8.0,8.0S16.419998,20.0 12.0,20.0z" />
<path
android:fillOpacity="0.9"
android:pathData="M12.5,6.0l-1.5,0.0 0.0,7.0 5.3029995,3.1819992 0.75,-1.249999 -4.5529995,-2.7320004z" />
</group>
<path
android:fillOpacity="0.9"
android:pathData="M11.994999,2.0C6.4679985,2.0 2.0,6.4780006 2.0,12.0s4.468,10.0 9.995,10.0S22.0,17.522 22.0,12.0S17.521,2.0 11.994999,2.0zM12.0,20.0c-4.42,0.0 -8.0,-3.582 -8.0,-8.0s3.58,-8.0 8.0,-8.0s8.0,3.582 8.0,8.0S16.419998,20.0 12.0,20.0z" />
<path
android:fillOpacity="0.9"
android:pathData="M12.5,6.0l-1.5,0.0 0.0,7.0 5.3029995,3.1819992 0.75,-1.249999 -4.5529995,-2.7320004z" />
</vector>

8
tests/VectorDrawableTest/res/drawable/vector_icon_settings.xml
View File

@@ -23,10 +23,8 @@ limitations under the License.
android:viewportHeight="24"
android:viewportWidth="24" />
<group>
<path
android:fill="#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>
<path
android:fill="#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" />
</vector>

12
tests/VectorDrawableTest/res/drawable/vector_test01.xml
View File

@@ -23,12 +23,10 @@ limitations under the License.
android:viewportHeight="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:strokeWidth="4" />
</group>
<path
android:name="002b"
android:pathData="M100,200c0,-100 150,-100 150,0s150,100 150,0t-200,299"
android:stroke="#FF0000FF"
android:strokeWidth="4" />
</vector>

12
tests/VectorDrawableTest/res/drawable/vector_test02.xml
View File

@@ -23,12 +23,10 @@ limitations under the License.
android:viewportHeight="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:strokeWidth="4" />
</group>
<path
android:name="002b"
android:pathData="M100,200c0,-100 150,-100 150,0s150,100 150,0T-200,299"
android:stroke="#FF0000FF"
android:strokeWidth="4" />
</vector>