From fba3bad3870d607ecaed4f147788885c841c2ab3 Mon Sep 17 00:00:00 2001 From: ztenghui Date: Wed, 2 Apr 2014 16:35:24 -0700 Subject: [PATCH] Clean up on VectorDrawable. Rename the test from DynamicDrawableTest to VectorDrawableTest. Remove duplicate function calls in the test. Fix comments in VectorDrawable Change-Id: I1ef87137088ccc10b1abdb40ca368345d9dbadab --- .../android/graphics/drawable/VectorDrawable.java | 4 ++-- tests/DynamicDrawableTest/lint.xml | 3 --- .../Android.mk | 2 +- .../AndroidManifest.xml | 2 +- .../res/drawable-hdpi/icon.png | Bin .../res/drawable/icon.png | Bin .../res/drawable/vector_drawable01.xml | 0 .../res/drawable/vector_drawable02.xml | 0 .../res/drawable/vector_drawable03.xml | 0 .../res/drawable/vector_drawable04.xml | 0 .../res/drawable/vector_drawable05.xml | 0 .../res/drawable/vector_drawable06.xml | 0 .../res/drawable/vector_drawable07.xml | 0 .../res/drawable/vector_drawable08.xml | 0 .../res/drawable/vector_drawable09.xml | 0 .../res/drawable/vector_drawable10.xml | 0 .../res/drawable/vector_drawable11.xml | 2 +- .../res/drawable/vector_drawable12.xml | 0 .../res/drawable/vector_drawable13.xml | 0 .../res/drawable/vector_drawable14.xml | 0 .../res/drawable/vector_drawable15.xml | 0 .../res/drawable/vector_drawable16.xml | 0 .../res/drawable/vector_drawable17.xml | 0 .../res/drawable/vector_drawable18.xml | 0 .../res/drawable/vector_drawable19.xml | 0 .../res/drawable/vector_drawable20.xml | 0 .../res/drawable/vector_icon_create.xml | 0 .../res/drawable/vector_icon_delete.xml | 0 .../res/drawable/vector_icon_heart.xml | 0 .../res/drawable/vector_icon_schedule.xml | 0 .../res/drawable/vector_icon_settings.xml | 0 .../res/drawable/vector_test01.xml | 0 .../res/drawable/vector_test02.xml | 0 .../res/values/strings.xml | 0 .../res/values/styles.xml | 0 .../com/android/test/dynamic/VectorCheckbox.java | 1 - .../com/android/test/dynamic/VectorDrawable01.java | 1 - .../android/test/dynamic/VectorDrawableDupPerf.java | 0 .../test/dynamic/VectorDrawablePerformance.java | 1 - .../test/dynamic/VectorDrawableStaticPerf.java | 0 .../android/test/dynamic/VectorDrawableTest.java | 0 .../android/test/dynamic/VectorPathChecking.java | 0 42 files changed, 5 insertions(+), 11 deletions(-) delete mode 100644 tests/DynamicDrawableTest/lint.xml rename tests/{DynamicDrawableTest => VectorDrawableTest}/Android.mk (94%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/AndroidManifest.xml (99%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable-hdpi/icon.png (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/icon.png (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_drawable01.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_drawable02.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_drawable03.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_drawable04.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_drawable05.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_drawable06.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_drawable07.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_drawable08.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_drawable09.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_drawable10.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_drawable11.xml (98%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_drawable12.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_drawable13.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_drawable14.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_drawable15.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_drawable16.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_drawable17.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_drawable18.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_drawable19.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_drawable20.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_icon_create.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_icon_delete.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_icon_heart.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_icon_schedule.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_icon_settings.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_test01.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/drawable/vector_test02.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/values/strings.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/res/values/styles.xml (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/src/com/android/test/dynamic/VectorCheckbox.java (98%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/src/com/android/test/dynamic/VectorDrawable01.java (98%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/src/com/android/test/dynamic/VectorDrawableDupPerf.java (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/src/com/android/test/dynamic/VectorDrawablePerformance.java (99%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/src/com/android/test/dynamic/VectorDrawableStaticPerf.java (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/src/com/android/test/dynamic/VectorDrawableTest.java (100%) rename tests/{DynamicDrawableTest => VectorDrawableTest}/src/com/android/test/dynamic/VectorPathChecking.java (100%) diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java index b2e7fdab411cc..33683ab9f82ca 100644 --- a/graphics/java/android/graphics/drawable/VectorDrawable.java +++ b/graphics/java/android/graphics/drawable/VectorDrawable.java @@ -61,9 +61,9 @@ import java.util.HashSet; *

*

*
<vector>
- *
* The attribute android:trigger defines a state change that + *
The attribute android:trigger defines a state change that * will drive the animation
- *
* The attribute android:versionCode defines the version of + *
The attribute android:versionCode defines the version of * VectorDrawable
*
<size>
*
Used to defined the intrinsic Width Height size of the drawable using diff --git a/tests/DynamicDrawableTest/lint.xml b/tests/DynamicDrawableTest/lint.xml deleted file mode 100644 index ee0eead5bb7d9..0000000000000 --- a/tests/DynamicDrawableTest/lint.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/tests/DynamicDrawableTest/Android.mk b/tests/VectorDrawableTest/Android.mk similarity index 94% rename from tests/DynamicDrawableTest/Android.mk rename to tests/VectorDrawableTest/Android.mk index 5c51301b55328..dd8a4d474ae28 100644 --- a/tests/DynamicDrawableTest/Android.mk +++ b/tests/VectorDrawableTest/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_PACKAGE_NAME := DynamicDrawableTest +LOCAL_PACKAGE_NAME := VectorDrawableTest LOCAL_MODULE_TAGS := tests diff --git a/tests/DynamicDrawableTest/AndroidManifest.xml b/tests/VectorDrawableTest/AndroidManifest.xml similarity index 99% rename from tests/DynamicDrawableTest/AndroidManifest.xml rename to tests/VectorDrawableTest/AndroidManifest.xml index 4ca3e3cd3dd53..06effe28a0e1d 100644 --- a/tests/DynamicDrawableTest/AndroidManifest.xml +++ b/tests/VectorDrawableTest/AndroidManifest.xml @@ -73,7 +73,7 @@ - + diff --git a/tests/DynamicDrawableTest/res/drawable-hdpi/icon.png b/tests/VectorDrawableTest/res/drawable-hdpi/icon.png similarity index 100% rename from tests/DynamicDrawableTest/res/drawable-hdpi/icon.png rename to tests/VectorDrawableTest/res/drawable-hdpi/icon.png diff --git a/tests/DynamicDrawableTest/res/drawable/icon.png b/tests/VectorDrawableTest/res/drawable/icon.png similarity index 100% rename from tests/DynamicDrawableTest/res/drawable/icon.png rename to tests/VectorDrawableTest/res/drawable/icon.png diff --git a/tests/DynamicDrawableTest/res/drawable/vector_drawable01.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable01.xml similarity index 100% rename from tests/DynamicDrawableTest/res/drawable/vector_drawable01.xml rename to tests/VectorDrawableTest/res/drawable/vector_drawable01.xml diff --git a/tests/DynamicDrawableTest/res/drawable/vector_drawable02.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable02.xml similarity index 100% rename from tests/DynamicDrawableTest/res/drawable/vector_drawable02.xml rename to tests/VectorDrawableTest/res/drawable/vector_drawable02.xml diff --git a/tests/DynamicDrawableTest/res/drawable/vector_drawable03.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable03.xml similarity index 100% rename from tests/DynamicDrawableTest/res/drawable/vector_drawable03.xml rename to tests/VectorDrawableTest/res/drawable/vector_drawable03.xml diff --git a/tests/DynamicDrawableTest/res/drawable/vector_drawable04.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable04.xml similarity index 100% rename from tests/DynamicDrawableTest/res/drawable/vector_drawable04.xml rename to tests/VectorDrawableTest/res/drawable/vector_drawable04.xml diff --git a/tests/DynamicDrawableTest/res/drawable/vector_drawable05.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable05.xml similarity index 100% rename from tests/DynamicDrawableTest/res/drawable/vector_drawable05.xml rename to tests/VectorDrawableTest/res/drawable/vector_drawable05.xml diff --git a/tests/DynamicDrawableTest/res/drawable/vector_drawable06.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable06.xml similarity index 100% rename from tests/DynamicDrawableTest/res/drawable/vector_drawable06.xml rename to tests/VectorDrawableTest/res/drawable/vector_drawable06.xml diff --git a/tests/DynamicDrawableTest/res/drawable/vector_drawable07.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable07.xml similarity index 100% rename from tests/DynamicDrawableTest/res/drawable/vector_drawable07.xml rename to tests/VectorDrawableTest/res/drawable/vector_drawable07.xml diff --git a/tests/DynamicDrawableTest/res/drawable/vector_drawable08.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable08.xml similarity index 100% rename from tests/DynamicDrawableTest/res/drawable/vector_drawable08.xml rename to tests/VectorDrawableTest/res/drawable/vector_drawable08.xml diff --git a/tests/DynamicDrawableTest/res/drawable/vector_drawable09.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable09.xml similarity index 100% rename from tests/DynamicDrawableTest/res/drawable/vector_drawable09.xml rename to tests/VectorDrawableTest/res/drawable/vector_drawable09.xml diff --git a/tests/DynamicDrawableTest/res/drawable/vector_drawable10.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable10.xml similarity index 100% rename from tests/DynamicDrawableTest/res/drawable/vector_drawable10.xml rename to tests/VectorDrawableTest/res/drawable/vector_drawable10.xml diff --git a/tests/DynamicDrawableTest/res/drawable/vector_drawable11.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable11.xml similarity index 98% rename from tests/DynamicDrawableTest/res/drawable/vector_drawable11.xml rename to tests/VectorDrawableTest/res/drawable/vector_drawable11.xml index a1a03be9e0caa..8787b342b225f 100644 --- a/tests/DynamicDrawableTest/res/drawable/vector_drawable11.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable11.xml @@ -29,7 +29,7 @@ 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:fill="#3388ff" android:stroke="#ff8833" - android:strokeWidth="1" + android:strokeWidth="1" android:rotation="0"/>