diff options
| author | ztenghui <ztenghui@google.com> | 2014-07-23 09:47:50 -0700 |
|---|---|---|
| committer | Tenghui Zhu <ztenghui@google.com> | 2014-07-25 23:26:41 +0000 |
| commit | a95c8abb366d9c39450513335f550b56da13b30a (patch) | |
| tree | 93bd8f429df7d0b8aa1aa7d22d4a60f60e36944b /tests/VectorDrawableTest | |
| parent | 9e8ade2eb7ee835963473c9cf6faaf5423b0b048 (diff) | |
| download | frameworks_base-a95c8abb366d9c39450513335f550b56da13b30a.zip frameworks_base-a95c8abb366d9c39450513335f550b56da13b30a.tar.gz frameworks_base-a95c8abb366d9c39450513335f550b56da13b30a.tar.bz2 | |
API REVIEW: VectorDrawable
- Merge <size> and <viewport> attributes all in to top-level <vector> tag
- Indent attributes under <group> in java doc.
- Updata android:stroke to be android:strokeColor, likewise android:fill
- Instead of android:clipToPath, make this a different clip-path tag.
- Document units of the various attributes
- Add example code for defining a VectorDrawable resource
More than that:
= Refactor the code to better support clipPath as a sub-class.
= Update all the xml files to use the new attributes and clip-path tag.
TODO:
-- Remove clipToPath, since that should happen on build break Friday.
bug:16488254
Change-Id: I6db5680ef83cb26c8f064a60fc7d6e7142974b0f
Diffstat (limited to 'tests/VectorDrawableTest')
35 files changed, 209 insertions, 362 deletions
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml index 3b01e02..705cc34 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml @@ -13,22 +13,18 @@ See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android"> - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="48dp" - android:width="48dp" /> - - <viewport + android:width="48dp" android:viewportHeight="480" - android:viewportWidth="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:fillColor="?android:attr/colorControlActivated" + android:strokeColor="?android:attr/colorControlActivated" android:strokeLineCap="round" android:strokeLineJoin="round" /> </group> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable02.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable02.xml index 40f23f0..f5d647c 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable02.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable02.xml @@ -12,14 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="64dp" - android:height="64dp"/> - - <viewport android:viewportWidth="320" - android:viewportHeight="320"/> + android:height="64dp" android:viewportWidth="320" + android:viewportHeight="320"> <group android:rotation="180" android:pivotX="70" @@ -27,8 +23,8 @@ <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:fillColor="#ff440000" + android:strokeColor="#FF00FF00" android:strokeWidth="10" android:trimPathStart=".1" android:trimPathEnd=".9"/> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable03.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable03.xml index cd2fd47..a0b0e00 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable03.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable03.xml @@ -14,23 +14,17 @@ limitations under the License. --> <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:autoMirrored="true" > - - <size android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="12.25" - android:viewportWidth="7.30625" /> + android:viewportWidth="7.30625" > <group android:pivotX="3.65" android:pivotY="6.125" android:rotation="-30" > - <path + <clip-path android:name="clip1" - android:clipToPath="true" android:pathData=" M 0, 6.125 l 7.3, 0 @@ -41,7 +35,7 @@ <group> <path android:name="one" - android:fill="#ff88ff" + android:fillColor="#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" /> @@ -50,9 +44,8 @@ android:pivotX="3.65" android:pivotY="6.125" android:rotation="-30" > - <path + <clip-path android:name="clip2" - android:clipToPath="true" android:pathData=" M 0, 0 l 7.3, 0 @@ -63,7 +56,7 @@ <group> <path android:name="two" - android:fill="#ff88ff" + android:fillColor="#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 diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable04.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable04.xml index d57ae8b..5a7f380 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable04.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable04.xml @@ -13,45 +13,33 @@ limitations under the License. --> <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:autoMirrored="true"> - - <size android:width="64dp" - android:height="64dp"/> - - <viewport + android:height="64dp" android:viewportWidth="7.30625" - android:viewportHeight="12.25"/> + android:viewportHeight="12.25"> <group> - <path + <clip-path android:name="clip1" 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" - /> - + a .001,.001 0 1,0-.002,0z"/> <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 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:fillColor="#ff88ff"/> + + <clip-path android:name="clip2" 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" - /> + a 6,6 0 1,0-12,0z"/> <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 @@ -63,7 +51,6 @@ 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" - /> + android:fillColor="#ff88ff"/> </group> </vector> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable05.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable05.xml index 673c465..5b1f6ab 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable05.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable05.xml @@ -14,26 +14,21 @@ limitations under the License. --> <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:autoMirrored="true"> - - <size android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="12.25" - android:viewportWidth="7.30625" /> + android:viewportWidth="7.30625" > <group> <path android:name="one" - android:fill="#ffff00" + android:fillColor="#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:fillColor="#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 diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable06.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable06.xml index ab5f7f4..98b6235 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable06.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable06.xml @@ -12,41 +12,37 @@ See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="64dp" - android:height="64dp"/> - - <viewport + android:height="64dp" android:viewportWidth="700" - android:viewportHeight="700"/> + android:viewportHeight="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:fill="#00000000" - android:stroke="#FF000000" + android:fillColor="#00000000" + android:strokeColor="#FF000000" android:strokeWidth="30.65500000000000"/> <path android:pathData="M 365.015 311.066" android:name="path2453" - android:fill="#00000000" - android:stroke="#FF000000" + android:fillColor="#00000000" + android:strokeColor="#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:strokeColor="#FF000000" + android:fillColor="#FFFFFFFF" android:strokeWidth="30.655000000000001"/> <path android:pathData="M 170.515 451.566L 305.61 313.46" android:name="path2457" - android:fill="#00000000" - android:stroke="#000000" + android:fillColor="#00000000" + android:strokeColor="#000000" android:strokeWidth="30.655000000000001"/> <path android:pathData="M 557.968 449.974L 426.515 315.375" android:name="path2459" - android:fill="#00000000" - android:stroke="#000000" + android:fillColor="#00000000" + android:strokeColor="#000000" android:strokeWidth="30.655000000000001"/> </group> </vector> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable07.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable07.xml index ccb0df0..88c4a1e 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable07.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable07.xml @@ -12,13 +12,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="64dp" - android:height="64dp"/> - - <viewport android:viewportWidth="140" - android:viewportHeight="110"/> + android:height="64dp" android:viewportWidth="140" + android:viewportHeight="110"> <group> <path @@ -26,7 +23,7 @@ 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" + android:fillColor="#ffffffff" /> </group> </vector> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable08.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable08.xml index 59f7459..75529e2 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable08.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable08.xml @@ -12,22 +12,17 @@ See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="64dp" - android:height="64dp"/> - - - <viewport android:viewportWidth="600" - android:viewportHeight="600"/> + android:height="64dp" android:viewportWidth="600" + android:viewportHeight="600"> <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:fillColor="#ffffcc00" + android:strokeColor="#FF00FF00" android:strokeWidth="1"/> </group> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable09.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable09.xml index 77434fc..853a770 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable09.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable09.xml @@ -13,15 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="200" - android:viewportWidth="200" /> + android:viewportWidth="200" > <group android:pivotX="100" @@ -29,7 +25,7 @@ android:rotation="90"> <path android:name="house" - android:fill="#ffffffff" + android:fillColor="#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"/> </group> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable10.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable10.xml index df24713..83ed194 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable10.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable10.xml @@ -14,32 +14,28 @@ See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportWidth="200" - android:viewportHeight="200"/> + android:viewportHeight="200"> <group> <path android:name="bar3" - android:fill="#FFFFFFFF" + android:fillColor="#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:fillColor="#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:fillColor="#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:fillColor="#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> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable11.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable11.xml index 3422bbf..b3d7d8e 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable11.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable11.xml @@ -13,26 +13,22 @@ See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="80" - android:viewportWidth="40" /> + android:viewportWidth="40" > <group> <path android:name="battery" - android:fill="#3388ff" + android:fillColor="#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:stroke="#ff8833" + android:strokeColor="#ff8833" android:strokeWidth="1" /> <path android:name="spark" - android:fill="#FFFF0000" + android:fillColor="#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> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable12.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable12.xml index a212def..2c8b751 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable12.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable12.xml @@ -13,15 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="600" - android:viewportWidth="600" /> + android:viewportWidth="600" > <group android:name="rotationGroup" @@ -30,16 +26,16 @@ android:rotation="45.0" > <path android:name="pie1" - android:fill="#00000000" + android:fillColor="#00000000" android:pathData="M300,70 a230,230 0 1,0 1,0 z" - android:stroke="#FF777777" + android:strokeColor="#FF777777" android:strokeWidth="70" android:trimPathEnd=".75" android:trimPathOffset="0" android:trimPathStart="0" /> <path android:name="v" - android:fill="#000000" + android:fillColor="#000000" android:pathData="M300,70 l 0,-70 70,70 0,0 -70,70z" /> <group @@ -55,7 +51,7 @@ <path android:name="twoLines1" android:pathData="@string/twoLinePathData" - android:stroke="#FFFF0000" + android:strokeColor="#FFFF0000" android:strokeWidth="20" /> <group @@ -69,9 +65,9 @@ android:rotation="-45.0" > <path android:name="twoLines2" - android:fill="#FF00FF00" + android:fillColor="#FF00FF00" android:pathData="@string/twoLinePathData" - android:stroke="#FF00FF00" + android:strokeColor="#FF00FF00" android:strokeWidth="20" /> <group @@ -86,7 +82,7 @@ <path android:name="twoLines3" android:pathData="@string/twoLinePathData" - android:stroke="#FF0000FF" + android:strokeColor="#FF0000FF" android:strokeWidth="20" /> </group> </group> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable13.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable13.xml index 8c946df..2468a1b 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable13.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable13.xml @@ -13,28 +13,24 @@ See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="400" - android:viewportWidth="600" /> + android:viewportWidth="600" > <group> <path android:name="pie1" - android:fill="#ffffffff" + android:fillColor="#ffffffff" android:pathData="M300,200 h-150 a150,150 0 1,0 150,-150 z" - android:stroke="#FF00FF00" + android:strokeColor="#FF00FF00" android:strokeWidth="1" /> <path android:name="half" - android:fill="#FFFF0000" + android:fillColor="#FFFF0000" android:pathData="M275,175 v-150 a150,150 0 0,0 -150,150 z" - android:stroke="#FF0000FF" + android:strokeColor="#FF0000FF" android:strokeWidth="5" /> </group> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable14.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable14.xml index 8d4ca61..01e24d3 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable14.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable14.xml @@ -13,15 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="500" - android:viewportWidth="800" /> + android:viewportWidth="800" > <group android:pivotX="90" @@ -34,8 +30,8 @@ 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:fill="#00000000" - android:stroke="#FF00FF00" + android:fillColor="#00000000" + android:strokeColor="#FF00FF00" android:strokeWidth="10" /> </group> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable15.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable15.xml index b08e157..4bab2e3 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable15.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable15.xml @@ -13,15 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="400" - android:viewportWidth="500" /> + android:viewportWidth="500" > <group android:pivotX="250" @@ -29,9 +25,9 @@ android:rotation="180"> <path android:name="house" - android:fill="#ff440000" + android:fillColor="#ff440000" android:pathData="M100,200 C100,100 250,100 250,200 S400,300 400,200" - android:stroke="#FFFF0000" + android:strokeColor="#FFFF0000" android:strokeWidth="10" /> </group> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable16.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable16.xml index ae85d9b..107cda2 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable16.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable16.xml @@ -13,25 +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" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="200" - android:viewportWidth="200" /> + android:viewportWidth="200" > <group> <path android:name="background1" android:pathData="M 0,0 l 100,0 l 0, 100 l -100, 0 z" - android:fill="#FF000000"/> + android:fillColor="#FF000000"/> <path android:name="background2" android:pathData="M 100,100 l 100,0 l 0, 100 l -100, 0 z" - android:fill="#FF000000"/> + android:fillColor="#FF000000"/> </group> <group android:pivotX="100" @@ -44,7 +40,7 @@ <path android:name="twoLines" android:pathData="M 100,10 v 90 M 10,100 h 90" - android:stroke="#FF00FF00" + android:strokeColor="#FF00FF00" android:strokeWidth="10" /> </group> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable17.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable17.xml index c28aff4..8019549 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable17.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable17.xml @@ -12,21 +12,17 @@ See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="64dp" - android:height="64dp"/> - - <viewport android:viewportWidth="1200" - android:viewportHeight="600"/> + android:height="64dp" android:viewportWidth="1200" + android:viewportHeight="600"> <group> <path android:name="house" android:pathData="M200,300 Q400,50 600,300 T1000,300" - android:fill="#00000000" - android:stroke="#FFFF0000" + android:fillColor="#00000000" + android:strokeColor="#FFFF0000" android:strokeWidth="10"/> </group> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable18.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable18.xml index d7042fd..c93bdb9 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable18.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable18.xml @@ -13,22 +13,18 @@ See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="400" - android:viewportWidth="500" /> + android:viewportWidth="500" > <group> <path android:name="house" android:pathData="M100,200 C100,100 250,100 250,200 S400,300 400,200" - android:fill="#00000000" - android:stroke="#FFFFFF00" + android:fillColor="#00000000" + android:strokeColor="#FFFFFF00" android:strokeWidth="10" /> </group> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable19.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable19.xml index 47a9574..996b6be 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable19.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable19.xml @@ -13,15 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="800" - android:viewportWidth="1000" /> + android:viewportWidth="1000" > <group> <path @@ -29,8 +25,8 @@ android:pathData="M10,300 Q400,550 600,300 T1000,300" android:pivotX="90" android:pivotY="100" - android:fill="#00000000" - android:stroke="#FFFF0000" + android:fillColor="#00000000" + android:strokeColor="#FFFF0000" android:strokeWidth="60" /> </group> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable20.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable20.xml index b8af7e2..5802144 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable20.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable20.xml @@ -13,25 +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" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="480" - android:viewportWidth="480" /> + android:viewportWidth="480" > <group> <path android:name="edit" - android:fill="#FF00FFFF" + android:fillColor="#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:strokeColor="#FF000000" android:strokeWidth="10" /> </group> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable21.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable21.xml index e0013e7..5626b44 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable21.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable21.xml @@ -13,25 +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" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="200" - android:viewportWidth="200" /> + android:viewportWidth="200" > <group> <path android:name="background1" android:pathData="M 0,0 l 100,0 l 0, 100 l -100, 0 z" - android:fill="#FF000000"/> + android:fillColor="#FF000000"/> <path android:name="background2" android:pathData="M 100,100 l 100,0 l 0, 100 l -100, 0 z" - android:fill="#FF000000"/> + android:fillColor="#FF000000"/> </group> <group android:pivotX="0" @@ -44,7 +40,7 @@ <path android:name="twoLines" android:pathData="M 100,10 v 90 M 10,100 h 90" - android:stroke="#FF00FF00" + android:strokeColor="#FF00FF00" android:strokeWidth="10" /> </group> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable22.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable22.xml index 8d38cb5..5b40d0d 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable22.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable22.xml @@ -13,24 +13,20 @@ See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="400" - android:viewportWidth="400" /> + android:viewportWidth="400" > <group android:name="backgroundGroup" > <path android:name="background1" - android:fill="#80000000" + android:fillColor="#80000000" android:pathData="M 0,0 l 200,0 l 0, 200 l -200, 0 z" /> <path android:name="background2" - android:fill="#80000000" + android:fillColor="#80000000" android:pathData="M 200,200 l 200,0 l 0, 200 l -200, 0 z" /> </group> <group @@ -40,7 +36,7 @@ <path android:name="twoLines" android:pathData="M 0,0 v 100 M 0,0 h 100" - android:stroke="#FFFF0000" + android:strokeColor="#FFFF0000" android:strokeWidth="20" /> <group @@ -51,7 +47,7 @@ <path android:name="twoLines1" android:pathData="M 0,0 v 100 M 0,0 h 100" - android:stroke="#FF00FF00" + android:strokeColor="#FF00FF00" android:strokeWidth="20" /> <group @@ -62,7 +58,7 @@ <path android:name="twoLines2" android:pathData="M 0,0 v 100 M 0,0 h 100" - android:stroke="#FF0000FF" + android:strokeColor="#FF0000FF" android:strokeWidth="20" /> </group> </group> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable23.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable23.xml index 52acd7a..6ab6ffd 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable23.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable23.xml @@ -13,24 +13,20 @@ See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="400" - android:viewportWidth="400" /> + android:viewportWidth="400" > <group android:name="backgroundGroup" > <path android:name="background1" - android:fill="#80000000" + android:fillColor="#80000000" android:pathData="M 0,0 l 200,0 l 0, 200 l -200, 0 z" /> <path android:name="background2" - android:fill="#80000000" + android:fillColor="#80000000" android:pathData="M 200,200 l 200,0 l 0, 200 l -200, 0 z" /> </group> <group @@ -40,7 +36,7 @@ <path android:name="twoLines" android:pathData="@string/twoLinePathData" - android:stroke="#FFFF0000" + android:strokeColor="#FFFF0000" android:strokeWidth="20" /> <group @@ -51,7 +47,7 @@ <path android:name="twoLines1" android:pathData="@string/twoLinePathData" - android:stroke="#FF00FF00" + android:strokeColor="#FF00FF00" android:strokeWidth="20" /> <group @@ -62,7 +58,7 @@ <path android:name="twoLines3" android:pathData="@string/twoLinePathData" - android:stroke="#FF0000FF" + android:strokeColor="#FF0000FF" android:strokeWidth="20" /> </group> </group> @@ -75,8 +71,8 @@ <path android:name="twoLines2" android:pathData="@string/twoLinePathData" - android:fill="?android:attr/colorForeground" - android:stroke="?android:attr/colorForeground" + android:fillColor="?android:attr/colorForeground" + android:strokeColor="?android:attr/colorForeground" android:strokeWidth="20" /> </group> </group> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable24.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable24.xml index c062d70..5c1ccaa 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable24.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable24.xml @@ -13,25 +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" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="400" - android:viewportWidth="400" /> + android:viewportWidth="400" > <group android:name="backgroundGroup" android:alpha = "0.5" > <path android:name="background1" - android:fill="#FF000000" + android:fillColor="#FF000000" android:pathData="M 0,0 l 200,0 l 0, 200 l -200, 0 z" /> <path android:name="background2" - android:fill="#FF000000" + android:fillColor="#FF000000" android:pathData="M 200,200 l 200,0 l 0, 200 l -200, 0 z" /> </group> <group @@ -42,7 +38,7 @@ <path android:name="twoLines" android:pathData="@string/twoLinePathData" - android:stroke="#FFFF0000" + android:strokeColor="#FFFF0000" android:strokeWidth="20" /> <group @@ -54,7 +50,7 @@ <path android:name="twoLines1" android:pathData="@string/twoLinePathData" - android:stroke="#FF00FF00" + android:strokeColor="#FF00FF00" android:strokeWidth="20" /> <group @@ -66,7 +62,7 @@ <path android:name="twoLines3" android:pathData="@string/twoLinePathData" - android:stroke="#FF0000FF" + android:strokeColor="#FF0000FF" android:strokeWidth="20" /> </group> </group> @@ -80,8 +76,8 @@ <path android:name="twoLines2" android:pathData="@string/twoLinePathData" - android:fill="?android:attr/colorForeground" - android:stroke="?android:attr/colorForeground" + android:fillColor="?android:attr/colorForeground" + android:strokeColor="?android:attr/colorForeground" android:strokeWidth="20" /> </group> </group> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable25.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable25.xml index a3f0447..069a531 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable25.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable25.xml @@ -13,15 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="400" - android:viewportWidth="400" /> + android:viewportWidth="400" > <group android:name="FirstLevelGroup" @@ -34,7 +30,7 @@ android:translateX="-100.0" android:translateY="50.0" > <path - android:fill="#FF00FF00" + android:fillColor="#FF00FF00" android:pathData="@string/rectangle200" /> <group @@ -43,7 +39,7 @@ android:translateX="-100.0" android:translateY="50.0" > <path - android:fill="#FF0000FF" + android:fillColor="#FF0000FF" android:pathData="@string/rectangle200" /> </group> <group @@ -52,7 +48,7 @@ android:translateX="100.0" android:translateY="50.0" > <path - android:fill="#FF000000" + android:fillColor="#FF000000" android:pathData="@string/rectangle200" /> </group> </group> @@ -62,7 +58,7 @@ android:translateX="100.0" android:translateY="50.0" > <path - android:fill="#FF0000FF" + android:fillColor="#FF0000FF" android:pathData="@string/rectangle200" /> <group @@ -71,7 +67,7 @@ android:translateX="-100.0" android:translateY="50.0" > <path - android:fill="#FFFF0000" + android:fillColor="#FFFF0000" android:pathData="@string/rectangle200" /> </group> <group @@ -80,13 +76,13 @@ android:translateX="100.0" android:translateY="50.0" > <path - android:fill="#FF00FF00" + android:fillColor="#FF00FF00" android:pathData="@string/rectangle200" /> </group> </group> <path - android:fill="#FFFF0000" + android:fillColor="#FFFF0000" android:pathData="@string/rectangle200" /> </group> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable_favorite.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable_favorite.xml index 5a66e2d..7be49a9 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable_favorite.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable_favorite.xml @@ -13,15 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="128dp" - android:width="128dp" /> - - <viewport + android:width="128dp" android:viewportHeight="480" - android:viewportWidth="480" /> + android:viewportWidth="480" > <group android:name="root" @@ -29,7 +25,7 @@ android:translateY="240.0" > <path android:name="favorite" - android:fill="#ff000000" + android:fillColor="#ff000000" android:pathData="M2.100006104,-6 C0.1449127197,-6,1.600006104,-5.975006104,0,-5.975006104 C-1.574996948,-5.975006104,0.00309753418,-6-1.949996948-6 diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable_grouping_1.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable_grouping_1.xml index 558de94..7839ad1 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable_grouping_1.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable_grouping_1.xml @@ -13,15 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="256" - android:viewportWidth="256" /> + android:viewportWidth="256" > <group android:name="shape_layer_1" @@ -30,7 +26,7 @@ <group android:name="sun" > <path android:name="ellipse_path_1" - android:fill="#ffff8000" + android:fillColor="#ffff8000" android:pathData="m -25 0 a 25,25 0 1,0 50,0 a 25,25 0 1,0 -50,0" /> <group @@ -38,7 +34,7 @@ android:translateX="75" > <path android:name="ellipse_path_1_1" - android:fill="#ff5656ea" + android:fillColor="#ff5656ea" android:pathData="m -10 0 a 10,10 0 1,0 20,0 a 10,10 0 1,0 -20,0" /> <group @@ -46,7 +42,7 @@ android:translateX="25" > <path android:name="ellipse_path_1_2" - android:fill="#ffadadad" + android:fillColor="#ffadadad" android:pathData="m -5 0 a 5,5 0 1,0 10,0 a 5,5 0 1,0 -10,0" /> </group> </group> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable_progress_bar.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable_progress_bar.xml index f1b2996..4544cae 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable_progress_bar.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable_progress_bar.xml @@ -13,15 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="64" - android:viewportWidth="64" /> + android:viewportWidth="64" > <group android:name="root" @@ -37,9 +33,9 @@ android:rotation="0" > <path android:name="pie1" - android:fill="#00000000" + android:fillColor="#00000000" android:pathData="M0, 0 m 0, -9.5 a 9.5,9.5 0 1,1 0,19 a 9.5,9.5 0 1,1 0,-19" - android:stroke="?android:attr/colorControlActivated" + android:strokeColor="?android:attr/colorControlActivated" android:strokeLineCap="round" android:strokeLineJoin="miter" android:strokeWidth="2" diff --git a/tests/VectorDrawableTest/res/drawable/vector_icon_create.xml b/tests/VectorDrawableTest/res/drawable/vector_icon_create.xml index 22ce795..0a6cedc 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_icon_create.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_icon_create.xml @@ -13,19 +13,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="24" - android:viewportWidth="24" /> + android:viewportWidth="24" > <group> <path - android:fill="#FF000000" + android:fillColor="#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> diff --git a/tests/VectorDrawableTest/res/drawable/vector_icon_delete.xml b/tests/VectorDrawableTest/res/drawable/vector_icon_delete.xml index 042173c..94c10df 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_icon_delete.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_icon_delete.xml @@ -13,19 +13,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="24" - android:viewportWidth="24" /> + android:viewportWidth="24" > <group> <path - android:fill="#FF000000" + android:fillColor="#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> diff --git a/tests/VectorDrawableTest/res/drawable/vector_icon_heart.xml b/tests/VectorDrawableTest/res/drawable/vector_icon_heart.xml index 6b6f43d..870e508 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_icon_heart.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_icon_heart.xml @@ -13,19 +13,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="24" - android:viewportWidth="24" /> + android:viewportWidth="24" > <group> <path - android:fill="#FF000000" + android:fillColor="#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> diff --git a/tests/VectorDrawableTest/res/drawable/vector_icon_schedule.xml b/tests/VectorDrawableTest/res/drawable/vector_icon_schedule.xml index ba8ebca..8cabca8 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_icon_schedule.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_icon_schedule.xml @@ -13,15 +13,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="24" - android:viewportWidth="24" /> + android:viewportWidth="24" > <group> <path diff --git a/tests/VectorDrawableTest/res/drawable/vector_icon_settings.xml b/tests/VectorDrawableTest/res/drawable/vector_icon_settings.xml index 896a938..7bd6304 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_icon_settings.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_icon_settings.xml @@ -13,19 +13,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="64dp" - android:width="64dp" /> - - <viewport + android:width="64dp" android:viewportHeight="24" - android:viewportWidth="24" /> + android:viewportWidth="24" > <group> <path - android:fill="#FF000000" + android:fillColor="#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> diff --git a/tests/VectorDrawableTest/res/drawable/vector_test01.xml b/tests/VectorDrawableTest/res/drawable/vector_test01.xml index fc2a15c..dd71ef0 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_test01.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_test01.xml @@ -13,23 +13,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="128dp" - android:width="128dp" /> - - <viewport + android:width="128dp" android:viewportHeight="512" - android:viewportWidth="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:strokeColor="#FF0000FF" android:strokeWidth="4" - android:fill="#00000000" /> + android:fillColor="#00000000" /> </group> </vector>
\ No newline at end of file diff --git a/tests/VectorDrawableTest/res/drawable/vector_test02.xml b/tests/VectorDrawableTest/res/drawable/vector_test02.xml index 9f4abbf..e4f48de 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_test02.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_test02.xml @@ -13,23 +13,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<vector xmlns:android="http://schemas.android.com/apk/res/android" > - - <size +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="128dp" - android:width="128dp" /> - - <viewport + android:width="128dp" android:viewportHeight="512" - android:viewportWidth="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:strokeColor="#FF0000FF" android:strokeWidth="4" - android:fill="#00000000" /> + android:fillColor="#00000000" /> </group> </vector>
\ No newline at end of file |