diff options
| author | ztenghui <ztenghui@google.com> | 2014-11-14 19:17:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-14 19:17:00 +0000 |
| commit | 2f96e233def36bb6a8afd62a24d101910b96c510 (patch) | |
| tree | 9863ed5f8373c44455266faf45793ba0b9116881 /tests | |
| parent | 076f0d5d0bad3b7abd0a753a32664be7c2f951d9 (diff) | |
| parent | bac3f5a6f055876d8892ff27fb8db7355a188a68 (diff) | |
| download | frameworks_base-2f96e233def36bb6a8afd62a24d101910b96c510.zip frameworks_base-2f96e233def36bb6a8afd62a24d101910b96c510.tar.gz frameworks_base-2f96e233def36bb6a8afd62a24d101910b96c510.tar.bz2 | |
am bac3f5a6: am 9f671553: am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev
* commit 'bac3f5a6f055876d8892ff27fb8db7355a188a68':
Fix the starting pen's position when a path close.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/VectorDrawableTest/res/drawable/vector_drawable30.xml | 28 | ||||
| -rw-r--r-- | tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable30.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable30.xml new file mode 100644 index 0000000..3dff196 --- /dev/null +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable30.xml @@ -0,0 +1,28 @@ +<!-- + 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. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + 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" + android:height="48dp" + android:width="48dp" + android:viewportHeight="48" + android:viewportWidth="48" > + + <group> + <path + android:name="plus1" + android:pathData="M20 16h-4v8h-8v4h8v8h4v-8h8v-4h-8zm9-3.84v3.64l5-1v21.2h4v-26z" + android:fillColor="#ff00ff00"/> + </group> +</vector> diff --git a/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java b/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java index 1cd6533..5a2e5a7 100644 --- a/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java +++ b/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java @@ -57,6 +57,7 @@ public class VectorDrawablePerformance extends Activity { R.drawable.vector_drawable27, R.drawable.vector_drawable28, R.drawable.vector_drawable29, + R.drawable.vector_drawable30, }; @Override |