diff options
| author | ztenghui <ztenghui@google.com> | 2014-09-04 15:25:25 -0700 |
|---|---|---|
| committer | ztenghui <ztenghui@google.com> | 2014-09-10 16:26:48 -0700 |
| commit | 2e17d2b232e11b3ec246c704d8c4707c8fd863fa (patch) | |
| tree | 3c70e7aefe7cd8f2db43e6e3eb154e75bb4e1e44 /tests/VectorDrawableTest | |
| parent | 05c4f7ad765e2178e6e28676fd3438d2aaa38894 (diff) | |
| download | frameworks_base-2e17d2b232e11b3ec246c704d8c4707c8fd863fa.zip frameworks_base-2e17d2b232e11b3ec246c704d8c4707c8fd863fa.tar.gz frameworks_base-2e17d2b232e11b3ec246c704d8c4707c8fd863fa.tar.bz2 | |
Bring back the fillAlpha and strokeAlpha.
At the same time, remove the group alpha since we did not follow the convention
that group's alpha should apply together, not separately to each elements.
b/17393626
Change-Id: Idfc071414213583924961dc8ea760d6fb317873c
Diffstat (limited to 'tests/VectorDrawableTest')
| -rw-r--r-- | tests/VectorDrawableTest/res/drawable/vector_drawable05.xml | 3 | ||||
| -rw-r--r-- | tests/VectorDrawableTest/res/drawable/vector_icon_schedule.xml | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tests/VectorDrawableTest/res/drawable/vector_drawable05.xml b/tests/VectorDrawableTest/res/drawable/vector_drawable05.xml index bbf1a17..f94ecba1 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_drawable05.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_drawable05.xml @@ -28,7 +28,8 @@ l-5.046875,0.0 0.0-1.0Z" /> <path android:name="two" - android:fillColor="#00ffff00" + android:fillColor="#ffff00" + android:fillAlpha="0" android:pathData="M 2.534375,9.6875l 4.140625,0.0 0.0,1.0-5.5625,0.0 0.0-1.0q 0.671875-0.6875 1.828125-1.859375 q 1.1718752-1.1875 1.4687502-1.53125 0.578125-0.625 0.796875-1.0625 q 0.234375-0.453125 0.234375-0.875 0.0-0.703125-0.5-1.140625 diff --git a/tests/VectorDrawableTest/res/drawable/vector_icon_schedule.xml b/tests/VectorDrawableTest/res/drawable/vector_icon_schedule.xml index 1aad743..3f79968 100644 --- a/tests/VectorDrawableTest/res/drawable/vector_icon_schedule.xml +++ b/tests/VectorDrawableTest/res/drawable/vector_icon_schedule.xml @@ -21,10 +21,12 @@ limitations under the License. <group> <path - android:fillColor="#E6000000" + android:fillColor="#FF000000" + android:fillAlpha="0.9" android:pathData="M11.994999,2.0C6.4679985,2.0 2.0,6.4780006 2.0,12.0s4.468,10.0 9.995,10.0S22.0,17.522 22.0,12.0S17.521,2.0 11.994999,2.0zM12.0,20.0c-4.42,0.0 -8.0,-3.582 -8.0,-8.0s3.58,-8.0 8.0,-8.0s8.0,3.582 8.0,8.0S16.419998,20.0 12.0,20.0z" /> <path - android:fillColor="#E6000000" + android:fillColor="#FF000000" + android:fillAlpha="0.9" android:pathData="M12.5,6.0l-1.5,0.0 0.0,7.0 5.3029995,3.1819992 0.75,-1.249999 -4.5529995,-2.7320004z" /> </group> |