diff options
| author | ztenghui <ztenghui@google.com> | 2014-05-23 10:51:33 -0700 |
|---|---|---|
| committer | ztenghui <ztenghui@google.com> | 2014-05-27 10:15:52 -0700 |
| commit | 6d9c422de5e0a3890dd723cb1b9264d4507053e9 (patch) | |
| tree | 8af7711a188e9074b1d01df40f9e860b4c9adbb1 /tests/VectorDrawableTest/res/drawable/vector_test02.xml | |
| parent | c33fb2b5c014f37ce36dbc12eff1e969562f7d50 (diff) | |
| download | frameworks_base-6d9c422de5e0a3890dd723cb1b9264d4507053e9.zip frameworks_base-6d9c422de5e0a3890dd723cb1b9264d4507053e9.tar.gz frameworks_base-6d9c422de5e0a3890dd723cb1b9264d4507053e9.tar.bz2 | |
Bring the group tag back to VectorDrawable.
This is the first step, including:
1. Bring the group tag back by reverting.
2. If there is no group tag, then treat all the paths as a single group.
Make sure our test cases covering both cases.
At the same time, fix one tiny UI bug in the test.
TODO:
1. Move the rotation to the group tag.
2. Add translation/scale to the group tag.
3. Convert the group into a tree hierarchy.
This reverts commit 404211630ba3bb865109434aba4433e7541b39d3.
Conflicts:
graphics/java/android/graphics/drawable/VectorDrawable.java
Change-Id: Ife65bb6a7fc85f9947124b8e356cd5b82119796a
Diffstat (limited to 'tests/VectorDrawableTest/res/drawable/vector_test02.xml')
| -rw-r--r-- | tests/VectorDrawableTest/res/drawable/vector_test02.xml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/VectorDrawableTest/res/drawable/vector_test02.xml b/tests/VectorDrawableTest/res/drawable/vector_test02.xml index c92b6f4..ab58c06 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_test02.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_test02.xml @@ -23,10 +23,12 @@ limitations under the License. android:viewportHeight="512" android:viewportWidth="512" /> - <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" /> + </group> </vector>
\ No newline at end of file |