diff options
| author | ztenghui <ztenghui@google.com> | 2014-05-06 11:07:37 -0700 |
|---|---|---|
| committer | ztenghui <ztenghui@google.com> | 2014-05-08 10:16:34 -0700 |
| commit | ddbbb8ae8561c9e61becd03faa40997d76ab5a51 (patch) | |
| tree | 8e3f6203e2298f2667e0648eb2ab74a33860b9de /tests/VectorDrawableTest | |
| parent | f73c8401a6ee76612edf4422ad9aa0dbc2ecf9c8 (diff) | |
| download | frameworks_base-ddbbb8ae8561c9e61becd03faa40997d76ab5a51.zip frameworks_base-ddbbb8ae8561c9e61becd03faa40997d76ab5a51.tar.gz frameworks_base-ddbbb8ae8561c9e61becd03faa40997d76ab5a51.tar.bz2 | |
Further cleaning on animated part of VectorDrawable.
State changed support is gone.
Rename VAnimatedPath.
Remove the obsolete documents.
Update the tests to reflect the API changes.
Change-Id: Icdc19c6519a4e29975877c1d167e61c8fa14a371
Diffstat (limited to 'tests/VectorDrawableTest')
19 files changed, 6 insertions, 557 deletions
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml index bb2bebf..d0f2a2d 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml @@ -14,7 +14,7 @@ limitations under the License. --> <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:trigger="state_checked" android:versionCode="1" > + android:versionCode="1" > <size android:height="48dp" @@ -26,53 +26,11 @@ <group> <path - android:name="check" - android:pathData="m20,200l100,90l180,-180l-35,-35l-145,145l-60,-60l-40,40z" - android:fill="?android:attr/colorControlActivated" /> - </group> - <group> - <path android:name="box1" - android:pathData="m127,171l37,38l33,-31l-37,-40l-1,3l-2,0l-30,30z" + 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> - <group> - <path - android:name="box2" - android:pathData="m127,171l37,38l33,-31l-37,-40l-1,3l-2,0l-30,30z" - android:rotation="46.757" - android:pivotX="162" - android:pivotY="173.5" - android:fill="?android:attr/colorControlNormal" - android:stroke="?android:attr/colorControlNormal" - android:strokeWidth="3" - android:strokeLineCap="round" - android:strokeLineJoin="round" /> - </group> - <group> - <path - android:name="box3" - android:pathData="m187,147l-1,55l-49,-1l2,-53l48,0z" - android:stroke="?android:attr/colorControlNormal" - android:strokeWidth="10" - android:strokeLineCap="round" - android:strokeLineJoin="round" /> - </group> - <group> - <path - android:name="box4" - android:pathData="m248,74l0,164l-177,0l1,-165l173,-1l3,2z" - android:stroke="?android:attr/colorControlNormal" - android:strokeWidth="30" - android:strokeLineCap="round" - android:strokeLineJoin="round" /> - </group> - - <animation - android:durations="300,100,0,300" - android:sequence="check,box1,box2,box3,box4" /> - </vector> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable02.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable02.xml index 49906d17..728624a 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable02.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable02.xml @@ -23,14 +23,6 @@ <group> <path - android:name="arrow" - android:pathData="M 100,225 L 100,115 L 130,115 L 70,15 L 10,115 L 40,115 L 40,225 z" - android:fill="#ffffffff" - android:stroke="#FF00FF00" - android:strokeWidth="1"/> - </group> - <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" @@ -42,5 +34,4 @@ android:trimPathStart=".1" android:trimPathEnd=".9"/> </group> - <animation android:sequence="arrow,house"/> </vector> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable03.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable03.xml index 137049d..1792683 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable03.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable03.xml @@ -71,67 +71,4 @@ android:fill="#ff88ff" /> </group> - <group> - <path - android:name="clip1" - 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="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:name="clip2" - android:pathData=" - M 0, 12.25 - 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 - 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 - q -0.609375,0.1875 -1.3125,0.59375l 0.0,-1.203125q 0.71875,-0.28125 1.328125,-0.421875 - 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> - - - <animation - android:sequence="one,one" - android:durations="4000"/> - <animation - android:sequence="two,two" - android:durations="4000"/> - <animation - android:sequence="clip1,clip1" - android:durations="4000"/> - <animation - android:sequence="clip2,clip2" - android:durations="4000"/> - </vector> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable04.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable04.xml index cffb73f..90694fb 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable04.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable04.xml @@ -65,62 +65,4 @@ android:fill="#ff88ff" /> </group> - <group> - <path - android:name="clip1" - 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="#332233" - /> - <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:name="clip2" - 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="#662233" - /> - <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 - 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 - q -0.609375,0.1875 -1.3125,0.59375l 0.0,-1.203125q 0.71875,-0.28125 1.328125,-0.421875 - 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> - - - - <animation - android:sequence="one,one" - android:durations="4000"/> - <animation - android:sequence="two,two" - android:durations="4000"/> - <animation - android:sequence="clip1,clip1" - android:durations="4000"/> - <animation - android:sequence="clip2,clip2" - android:durations="4000"/> - </vector> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable05.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable05.xml index 0be6755..c6595fa 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable05.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable05.xml @@ -44,95 +44,4 @@ 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> - <group> - <path - android:name="one" - android:fill="#ffff00" - android:fillOpacity="0" - 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: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 - q -0.609375,0.1875 -1.3125,0.59375l 0.0,-1.203125q 0.71875,-0.28125 1.328125,-0.421875 - 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" /> - </group> - <group> - <path - android:name="two" - android:fill="#ffff00" - 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 - q -0.609375,0.1875 -1.3125,0.59375l 0.0,-1.203125q 0.71875,-0.28125 1.328125,-0.421875 - 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" /> - <path - android:name="three" - android:fill="#ffff00" - android:fillOpacity="0" - android:pathData="M 5.103125,6.003125q 0.84375,0.1875 1.3125,0.765625 0.484375,0.5625 0.484375,1.40625 - q 0.0,1.296875 -0.890625,2.015625 -0.890625,0.703125 -2.53125,0.703125 - q -0.546875,0.0 -1.140625,-0.109375 -0.5781251,-0.109375 -1.1875001,-0.328125 - l 0.0,-1.140625q 0.484375,0.28125 1.0625001,0.4375 0.59375,0.140625 1.234375,0.140625 - q 1.109375,0.0 1.6875,-0.4375 0.59375,-0.4375 0.59375,-1.28125 - q 0.0,-0.765625 -0.546875,-1.203125 -0.546875,-0.4375 -1.5,-0.4375 - l -1.03125,0.0 0.0,-0.96875 1.078125,0.0q 0.859375,0.0 1.328125,-0.34375 - q 0.46875,-0.359375 0.46875,-1.015625 0.0,-0.671875 -0.484375,-1.03125 - q -0.46875,-0.359375 -1.359375,-0.359375 -0.5,0.0 -1.0625,0.109375 - q -0.546875,0.09375 -1.2187501,0.3125l 0.0,-1.046875q 0.6875001,-0.1875 1.2656251,-0.28125 - q 0.59375,-0.09375 1.109375,-0.09375 1.359375,0.0 2.140625,0.609375 - q 0.78125,0.609375 0.78125,1.65625 0.0,0.734375 -0.421875,1.234375 - q -0.40625,0.5 -1.171875,0.6875Z" /> - </group> - <group> - <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 - q -0.609375,0.1875 -1.3125,0.59375l 0.0,-1.203125q 0.71875,-0.28125 1.328125,-0.421875 - 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" /> - <path - android:name="three" - android:fill="#ffff00" - android:pathData="M 5.103125,6.003125q 0.84375,0.1875 1.3125,0.765625 0.484375,0.5625 0.484375,1.40625 - q 0.0,1.296875 -0.890625,2.015625 -0.890625,0.703125 -2.53125,0.703125 - q -0.546875,0.0 -1.140625,-0.109375 -0.5781251,-0.109375 -1.1875001,-0.328125 - l 0.0,-1.140625q 0.484375,0.28125 1.0625001,0.4375 0.59375,0.140625 1.234375,0.140625 - q 1.109375,0.0 1.6875,-0.4375 0.59375,-0.4375 0.59375,-1.28125 - q 0.0,-0.765625 -0.546875,-1.203125 -0.546875,-0.4375 -1.5,-0.4375 - l -1.03125,0.0 0.0,-0.96875 1.078125,0.0q 0.859375,0.0 1.328125,-0.34375 - q 0.46875,-0.359375 0.46875,-1.015625 0.0,-0.671875 -0.484375,-1.03125 - q -0.46875,-0.359375 -1.359375,-0.359375 -0.5,0.0 -1.0625,0.109375 - q -0.546875,0.09375 -1.2187501,0.3125l 0.0,-1.046875q 0.6875001,-0.1875 1.2656251,-0.28125 - q 0.59375,-0.09375 1.109375,-0.09375 1.359375,0.0 2.140625,0.609375 - q 0.78125,0.609375 0.78125,1.65625 0.0,0.734375 -0.421875,1.234375 - q -0.40625,0.5 -1.171875,0.6875Z" /> - </group> - - <animation - android:durations="2000,0,2000" - android:sequence="one,one,three,three" /> - <animation - android:durations="2000,0,2000" - android:sequence="two,two,two,two" /> - </vector>
\ No newline at end of file diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable06.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable06.xml index 73ff5e2..850de28 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable06.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable06.xml @@ -23,29 +23,6 @@ android:viewportHeight="700"/> <group> - </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="#FF0000FF" - 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> <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" @@ -68,9 +45,4 @@ android:stroke="#000000" android:strokeWidth="30.655000000000001"/> </group> - - <animation android:sequence="path2451,path2451" - android:durations="1000"/> - - </vector> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable07.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable07.xml index 99d37ef..7c7e679 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable07.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable07.xml @@ -19,14 +19,7 @@ <viewport android:viewportWidth="140" android:viewportHeight="110"/> - <group> - <path - android:name="menu" - android:pathData="M 20,20 l 100,0 0,10 -100,0 z - M 20,50 l 100,0 0,10 -100,0 z - M 20,80 l 0,-10 100,0 0,10 z" - android:fill="#ffffffff"/> - </group> + <group> <path android:name="back" @@ -34,12 +27,6 @@ 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:rotation="180" - android:pivotX="70" - android:pivotY="55" /> </group> - <animation android:sequence="menu,back"/> - - </vector> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable08.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable08.xml index f8a03d7..59f7459 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable08.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable08.xml @@ -31,18 +31,4 @@ android:strokeWidth="1"/> </group> - <group> - <path - android:name="pie2" - android:pathData="M564.441,287A280.868,280.868 0 1,1 564.441,285L284.493,286.29Z" - android:fill="#FFccaa00" - android:stroke="#FF000000" - android:strokeWidth="10" - android:pivotX="90" - android:pivotY="100"/> - </group> - - <animation android:sequence="pie1,pie2"/> - - </vector> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable09.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable09.xml index b3c91a8..2e379d6 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable09.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable09.xml @@ -25,12 +25,6 @@ <group> <path - android:name="arrow" - android:fill="#ffffffff" - android:pathData="M 20,20 l 60,0 0,140 -60,0 z M 120,20 l 60,0 0,140 -60,0 z" /> - </group> - <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" @@ -39,6 +33,4 @@ android:rotation="90" /> </group> - <animation android:sequence="arrow,house" /> - </vector>
\ No newline at end of file diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable10.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable10.xml index 7aca169..8484e9e 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable10.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable10.xml @@ -21,8 +21,8 @@ android:width="64dp" /> <viewport - android:viewportHeight="200" - android:viewportWidth="200" /> + android:viewportWidth="200" + android:viewportHeight="200"/> <group> <path @@ -31,24 +31,6 @@ 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="#FF555555" - 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> - <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 @@ -60,54 +42,5 @@ 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> - <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="#FFFFFFFF" - 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> - <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="#FFFFFFFF" - 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="#FFFFFFFF" - 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> - - <animation - android:durations="500,500,500" - android:sequence="bar0,bar0,bar0,bar0" /> - <animation - android:durations="500,500,500" - android:sequence="bar1,bar1,bar1,bar1" /> - <animation - android:durations="500,500,500" - android:sequence="bar2,bar2,bar2,bar2" /> - <animation - android:durations="500,500,500" - android:sequence="bar3,bar3,bar3,bar3" /> </vector>
\ No newline at end of file diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable11.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable11.xml index a4403c5..2b6c5d3 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable11.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable11.xml @@ -36,25 +36,5 @@ 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> - <group> - <path - android:name="battery" - android:fill="#ff8833" - 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="#3388ff" - 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> - - <animation - android:durations="2000" - android:sequence="spark,spark" /> - <animation - android:durations="2000" - android:sequence="battery,battery" /> </vector>
\ No newline at end of file diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable12.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable12.xml index 207879d..681eb4f 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable12.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable12.xml @@ -40,48 +40,5 @@ android:pivotY="300" android:rotation="0" /> </group> - <group> - <path - android:name="v" - android:pathData="M300,70 l 0,-70 70,70 -70,70z" - android:pivotX="300" - android:pivotY="300" - android:rotation="360" /> - <path - android:name="pie2" - android:pathData="M300,70 a230,230 0 1,0 1,0 z" - android:pivotX="300" - android:pivotY="300" - android:rotation="360" - android:stroke="#FF00FF00" - android:strokeLineCap="round" - android:strokeWidth="70" - android:trimPathEnd=".5" - android:trimPathOffset="0" - android:trimPathStart="0" /> - </group> - - <animation - android:animate="easeInOut" - android:durations="2000" - android:repeatCount="-1" - android:repeatStyle="forward" - android:sequence="pie1,pie2" - android:startOffset="500" /> - <animation - android:animate="easeInOut" - android:durations="2000" - android:repeatCount="-1" - android:repeatStyle="forward" - android:sequence="v,v" - android:startOffset="500" /> - <animation - android:animate="easeInOut" - android:durations="2800" - android:limitTo="trimPathEnd" - android:repeatCount="-1" - android:repeatStyle="reverse" - android:sequence="pie1,pie2" - android:startOffset="500" /> </vector>
\ No newline at end of file diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable13.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable13.xml index 4a2ed90..ef1b8e4 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable13.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable13.xml @@ -40,40 +40,5 @@ android:stroke="#FF0000FF" android:strokeWidth="5" /> </group> - <group> - <path - android:name="pie2" - android:fill="#ffff0000" - android:pathData="M300,200 h-150 a150,150 0 1,0 150,-150 z" - android:pivotX="300" - android:pivotY="200" - android:rotation="360" - android:stroke="#FF00FF00" - android:strokeWidth="10" /> - <path - android:name="half" - android:fill="#FFFFFF00" - android:pathData="M275,175 v-150 a150,150 0 0,0 -150,150 z" - android:pivotX="300" - android:pivotY="200" - android:rotation="-360" - android:stroke="#FF0000FF" - android:strokeWidth="5" /> - </group> - - <animation - android:animate="easeInOut" - android:durations="1000" - android:repeatCount="2" - android:repeatStyle="forward" - android:sequence="pie1,pie2" - android:startOffset="500" /> - <animation - android:animate="easeInOut" - android:durations="1000" - android:repeatCount="5" - android:repeatStyle="forward" - android:sequence="half,half" - android:startOffset="500" /> </vector>
\ No newline at end of file diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable14.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable14.xml index 6ebd56b..77bf723 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable14.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable14.xml @@ -25,17 +25,6 @@ <group> <path - android:name="pie1" - android:pathData="M200,450 l 50,-25 - a25,25 -30 0,1 100,-50 l 50,-25 - a25,50 -30 0,1 100,-50 l 50,-25 - a25,75 -30 0,1 100,-50 l 50,-25 - a25,100 -30 0,1 100,-50 l 50,-25" - android:stroke="#FF00FF00" - android:strokeWidth="10" /> - </group> - <group> - <path android:name="pie2" android:pathData="M200,350 l 50,-25 a25,12 -30 0,1 100,-50 l 50,-25 @@ -49,6 +38,4 @@ android:strokeWidth="10" /> </group> - <animation android:sequence="pie1,pie2" /> - </vector>
\ No newline at end of file diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable15.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable15.xml index 3c92d25..df5838c 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable15.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable15.xml @@ -25,14 +25,6 @@ <group> <path - android:name="arrow" - android:fill="#ffffffff" - android:pathData="M100,200 C100,100 250,100 250,200 S400,300 400,200" - android:stroke="#FFFF0000" - android:strokeWidth="1" /> - </group> - <group> - <path android:name="house" android:fill="#ff440000" android:pathData="M100,200 C100,100 250,100 250,200 S400,300 400,200" @@ -43,6 +35,4 @@ android:strokeWidth="10" /> </group> - <animation android:sequence="arrow,house" /> - </vector>
\ No newline at end of file diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable16.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable16.xml index 7e757a5..0bdcda5 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable16.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable16.xml @@ -25,13 +25,6 @@ <group> <path - android:name="arrow" - android:pathData="M 100,10 v 180 M 10,100 h 180" - android:stroke="#FF00FF00" - android:strokeWidth="1" /> - </group> - <group> - <path android:name="house" android:pathData="M 100,10 v 90 M 10,100 h 90" android:pivotX="100" @@ -41,6 +34,4 @@ android:strokeWidth="10" /> </group> - <animation android:sequence="arrow,house" /> - </vector>
\ No newline at end of file diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable17.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable17.xml index 9427652..4453ae4 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable17.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable17.xml @@ -23,14 +23,6 @@ <group> <path - android:name="arrow" - android:pathData="M200,300 Q400,50 600,300 T1000,300" - android:stroke="#FF00FF00" - android:strokeWidth="1"/> - </group> - - <group> - <path android:name="house" android:pathData="M200,300 Q400,50 600,300 T1000,300" android:stroke="#FFFF0000" @@ -40,7 +32,4 @@ android:pivotY="300"/> </group> - <animation android:sequence="arrow,house"/> - - </vector> diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable18.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable18.xml index 69212f5..dfae9ac 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable18.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable18.xml @@ -25,21 +25,13 @@ <group> <path - android:name="arrow" - android:pathData="M100,200 C100,100 250,100 250,200 S400,300 400,200" - android:stroke="#FFFFFF00" - android:strokeWidth="10" /> - </group> - <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> - <animation android:sequence="arrow,house" /> - </vector>
\ No newline at end of file diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable19.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable19.xml index 2dca48d..a890fd6 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable19.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable19.xml @@ -25,13 +25,6 @@ <group> <path - android:name="arrow" - android:pathData="M10,300 Q400,50 600,300 T1000,300" - android:stroke="#FF00FFFF" - android:strokeWidth="40" /> - </group> - <group> - <path android:name="house" android:pathData="M10,300 Q400,550 600,300 T1000,300" android:pivotX="90" @@ -40,6 +33,4 @@ android:strokeWidth="60" /> </group> - <animation android:sequence="arrow,house" /> - </vector>
\ No newline at end of file |