summaryrefslogtreecommitdiffstats
path: root/tests/VectorDrawableTest/src/com/android/test
diff options
context:
space:
mode:
authorztenghui <ztenghui@google.com>2014-05-23 10:51:33 -0700
committerztenghui <ztenghui@google.com>2014-05-27 10:15:52 -0700
commit6d9c422de5e0a3890dd723cb1b9264d4507053e9 (patch)
tree8af7711a188e9074b1d01df40f9e860b4c9adbb1 /tests/VectorDrawableTest/src/com/android/test
parentc33fb2b5c014f37ce36dbc12eff1e969562f7d50 (diff)
downloadframeworks_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/src/com/android/test')
-rw-r--r--tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java b/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java
index b918cdd..dcc7769 100644
--- a/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java
+++ b/tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java
@@ -68,7 +68,6 @@ public class VectorDrawablePerformance extends Activity {
TextView t = new TextView(this);
DecimalFormat df = new DecimalFormat("#.##");
t.setText("avgL=" + df.format(time / (icon.length * 1000000.)) + " ms");
- t.setBackgroundColor(0xFF000000);
container.addView(t);
time = android.os.SystemClock.elapsedRealtimeNanos();
for (int i = 0; i < icon.length; i++) {
@@ -81,7 +80,6 @@ public class VectorDrawablePerformance extends Activity {
time = android.os.SystemClock.elapsedRealtimeNanos()-time;
t = new TextView(this);
t.setText("avgS=" + df.format(time / (icon.length * 1000000.)) + " ms");
- t.setBackgroundColor(0xFF000000);
container.addView(t);
}
}