diff options
| author | ztenghui <ztenghui@google.com> | 2014-09-24 23:07:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-24 23:07:35 +0000 |
| commit | 9d23862bfdc18729e9d5f5a5c98e84fdf293f006 (patch) | |
| tree | 900937fe6cd9f1b68cbcc17c75d2e2c8089051fd /tests/VectorDrawableTest/res | |
| parent | dde353394c43ad01820c27db403cb9dedd36da4e (diff) | |
| parent | 80f44408a19485a1ca134ec88c14e8bc975c0ce3 (diff) | |
| download | frameworks_base-9d23862bfdc18729e9d5f5a5c98e84fdf293f006.zip frameworks_base-9d23862bfdc18729e9d5f5a5c98e84fdf293f006.tar.gz frameworks_base-9d23862bfdc18729e9d5f5a5c98e84fdf293f006.tar.bz2 | |
Merge "Add one more test and update old tests" into lmp-dev
Diffstat (limited to 'tests/VectorDrawableTest/res')
| -rw-r--r-- | tests/VectorDrawableTest/res/drawable/vector_drawable24.xml | 15 | ||||
| -rw-r--r-- | tests/VectorDrawableTest/res/drawable/vector_drawable25.xml | 7 |
2 files changed, 5 insertions, 17 deletions
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable24.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable24.xml index 5c1ccaa..f0b4699 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable24.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable24.xml @@ -19,8 +19,7 @@ android:viewportHeight="400" android:viewportWidth="400" > - <group android:name="backgroundGroup" - android:alpha = "0.5" > + <group android:name="backgroundGroup"> <path android:name="background1" android:fillColor="#FF000000" @@ -33,8 +32,7 @@ <group android:name="translateToCenterGroup" android:translateX="50.0" - android:translateY="90.0" - android:alpha = "0.5" > + android:translateY="90.0" > <path android:name="twoLines" android:pathData="@string/twoLinePathData" @@ -45,8 +43,7 @@ android:name="rotationGroup" android:pivotX="0.0" android:pivotY="0.0" - android:rotation="-45.0" - android:alpha = "0.5" > + android:rotation="-45.0"> <path android:name="twoLines1" android:pathData="@string/twoLinePathData" @@ -56,8 +53,7 @@ <group android:name="translateGroup" android:translateX="130.0" - android:translateY="160.0" - android:alpha = "0.5"> + android:translateY="160.0"> <group android:name="scaleGroup" > <path android:name="twoLines3" @@ -70,8 +66,7 @@ <group android:name="translateGroupHalf" android:translateX="65.0" - android:translateY="80.0" - android:alpha = "0.5"> + android:translateY="80.0"> <group android:name="scaleGroup" > <path android:name="twoLines2" diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable25.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable25.xml index 069a531..f46d14e 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable25.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable25.xml @@ -21,12 +21,10 @@ <group android:name="FirstLevelGroup" - android:alpha="0.9" android:translateX="100.0" android:translateY="0.0" > <group android:name="SecondLevelGroup1" - android:alpha="0.9" android:translateX="-100.0" android:translateY="50.0" > <path @@ -35,7 +33,6 @@ <group android:name="ThridLevelGroup1" - android:alpha="0.9" android:translateX="-100.0" android:translateY="50.0" > <path @@ -44,7 +41,6 @@ </group> <group android:name="ThridLevelGroup2" - android:alpha="0.8" android:translateX="100.0" android:translateY="50.0" > <path @@ -54,7 +50,6 @@ </group> <group android:name="SecondLevelGroup2" - android:alpha="0.8" android:translateX="100.0" android:translateY="50.0" > <path @@ -63,7 +58,6 @@ <group android:name="ThridLevelGroup3" - android:alpha="0.9" android:translateX="-100.0" android:translateY="50.0" > <path @@ -72,7 +66,6 @@ </group> <group android:name="ThridLevelGroup4" - android:alpha="0.8" android:translateX="100.0" android:translateY="50.0" > <path |