Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add group scaling factor into stroke width.

Browse Source 
Originally, stroke width is independent of group scaling.
But that is a bug and causing animation trouble.

b/19501782

Change-Id: I33d5e44f2f8b2a82fee1a5a326223a39aaffa86c
This commit is contained in:
ztenghui
2015-04-01 16:38:44 -07:00
parent 072be09aaf
commit 9af77a4ce2
7 changed files with 276 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
tests/VectorDrawableTest/res/drawable/vector_drawable_scale0.xml Normal file
View File

@@ -0,0 +1,57 @@
<!--
Copyright (C) 2015 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="64dp"
android:viewportHeight="200"
android:viewportWidth="200"
android:width="64dp" >
<group>
<path
android:name="background1"
android:fillColor="#FF000000"
android:pathData="M 0,0 l 100,0 l 0, 100 l -100, 0 z" />
<path
android:name="background2"
android:fillColor="#FF000000"
android:pathData="M 100,100 l 100,0 l 0, 100 l -100, 0 z" />
</group>
<group
android:pivotX="0"
android:pivotY="0"
android:rotation="90" >
<group
android:scaleX="1.5"
android:scaleY="1" >
<group
android:pivotX="0"
android:pivotY="0"
android:rotation="-90" >
<group
android:scaleX="1.5"
android:scaleY="1" >
<path
android:name="twoLines"
android:fillColor="#FFFF0000"
android:pathData="M 100, 0 l 0, 100, -100, 0 z"
android:strokeColor="#FF00FF00"
android:strokeWidth="10" />
</group>
</group>
</group>
</group>
</vector>

52
tests/VectorDrawableTest/res/drawable/vector_drawable_scale1.xml Normal file
View File

@@ -0,0 +1,52 @@
<!--
Copyright (C) 2015 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="64dp"
android:viewportHeight="200"
android:viewportWidth="200"
android:width="64dp" >
<group>
<path
android:name="background1"
android:fillColor="#FF000000"
android:pathData="M 0,0 l 100,0 l 0, 100 l -100, 0 z" />
<path
android:name="background2"
android:fillColor="#FF000000"
android:pathData="M 100,100 l 100,0 l 0, 100 l -100, 0 z" />
</group>
<group
android:scaleX="-1"
android:scaleY="-1" >
<group
android:scaleX="-1"
android:scaleY="-1" >
<group
android:pivotX="100"
android:pivotY="100"
android:rotation="45" >
<path
android:name="twoLines"
android:fillColor="#FFFF0000"
android:pathData="M 100, 0 l 0, 100, -100, 0 z"
android:strokeColor="#FF00FF00"
android:strokeWidth="10" />
</group>
</group>
</group>
</vector>

48
tests/VectorDrawableTest/res/drawable/vector_drawable_scale2.xml Normal file
View File

@@ -0,0 +1,48 @@
<!--
Copyright (C) 2015 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="64dp"
android:viewportHeight="200"
android:viewportWidth="200"
android:width="64dp" >
<group>
<path
android:name="background1"
android:fillColor="#FF000000"
android:pathData="M 0,0 l 100,0 l 0, 100 l -100, 0 z" />
<path
android:name="background2"
android:fillColor="#FF000000"
android:pathData="M 100,100 l 100,0 l 0, 100 l -100, 0 z" />
</group>
<group
android:scaleX="2"
android:scaleY="0.5" >
<group
android:pivotX="100"
android:pivotY="100"
android:rotation="45" >
<path
android:name="twoLines"
android:fillColor="#FFFF0000"
android:pathData="M 100, 0 l 0, 100, -100, 0 z"
android:strokeColor="#FF00FF00"
android:strokeWidth="10" />
</group>
</group>
</vector>

62
tests/VectorDrawableTest/res/drawable/vector_drawable_scale3.xml Normal file
View File

@@ -0,0 +1,62 @@
<!--
Copyright (C) 2015 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="64dp"
android:viewportHeight="200"
android:viewportWidth="200"
android:width="64dp" >
<group>
<path
android:name="background1"
android:fillColor="#FF000000"
android:pathData="M 0,0 l 100,0 l 0, 100 l -100, 0 z" />
<path
android:name="background2"
android:fillColor="#FF000000"
android:pathData="M 100,100 l 100,0 l 0, 100 l -100, 0 z" />
</group>
<group
android:pivotX="0"
android:pivotY="0"
android:rotation="45" >
<group
android:pivotX="0"
android:pivotY="0"
android:rotation="90" >
<group
android:scaleX="1.5"
android:scaleY="1" >
<group
android:pivotX="0"
android:pivotY="0"
android:rotation="-90" >
<group
android:scaleX="1.5"
android:scaleY="1" >
<path
android:name="twoLines"
android:fillColor="#FFFF0000"
android:pathData="M 100, 0 l 0, 100, -100, 0 z"
android:strokeColor="#FF00FF00"
android:strokeWidth="10" />
</group>
</group>
</group>
</group>
</group>
</vector>

4
tests/VectorDrawableTest/src/com/android/test/dynamic/VectorDrawablePerformance.java
View File

@@ -65,6 +65,10 @@ public class VectorDrawablePerformance extends Activity {
R.drawable.vector_drawable28,
R.drawable.vector_drawable29,
R.drawable.vector_drawable30,
R.drawable.vector_drawable_scale0,
R.drawable.vector_drawable_scale1,
R.drawable.vector_drawable_scale2,
R.drawable.vector_drawable_scale3,
};
public static VectorDrawable create(Resources resources, int rid) {