diff options
author | ztenghui <ztenghui@google.com> | 2014-11-19 10:38:18 -0800 |
---|---|---|
committer | ztenghui <ztenghui@google.com> | 2014-11-20 14:41:33 -0800 |
commit | 5b84eace6cb79c42fe43480f08c68b7dea4e074a (patch) | |
tree | a401793cd0171d04d5b3e41f6fe6b654563bf397 /tests/VectorDrawableTest | |
parent | 521ca5f8fba355f526e82dc3a8fc6520e4379874 (diff) | |
download | frameworks_base-5b84eace6cb79c42fe43480f08c68b7dea4e074a.zip frameworks_base-5b84eace6cb79c42fe43480f08c68b7dea4e074a.tar.gz frameworks_base-5b84eace6cb79c42fe43480f08c68b7dea4e074a.tar.bz2 |
ASLD: ASLD's XML reversible flag can turn off the reverse behavior now.
Previously, the android:reversible flag behaves like a suggestion.
Now it is used to enforce no reverse when set to false. In this way, user can
safely setup one direction animation only.
When set to true, but AVD can't reverse , then it will show a warning.
At the same time, update the tests to show different cases, including
AnimationDrawable.
b/18413484
Change-Id: I5552c49dcbd76b0724b4d5593bce8388b27bd905
Diffstat (limited to 'tests/VectorDrawableTest')
9 files changed, 166 insertions, 12 deletions
diff --git a/tests/VectorDrawableTest/res/anim/animation_grouping_1_01.xml b/tests/VectorDrawableTest/res/anim/animation_grouping_1_01.xml index 8d82d05..8ab79a5 100644 --- a/tests/VectorDrawableTest/res/anim/animation_grouping_1_01.xml +++ b/tests/VectorDrawableTest/res/anim/animation_grouping_1_01.xml @@ -15,12 +15,8 @@ limitations under the License. --> -<set xmlns:android="http://schemas.android.com/apk/res/android" > - - <objectAnimator - android:duration="3300" - android:propertyName="rotation" - android:valueFrom="0" - android:valueTo="360" - android:repeatCount="-1" /> -</set>
\ No newline at end of file +<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android" + android:duration="3300" + android:propertyName="rotation" + android:valueFrom="0" + android:valueTo="450" /> diff --git a/tests/VectorDrawableTest/res/drawable/state_animation_drawable04.xml b/tests/VectorDrawableTest/res/drawable/state_animation_drawable04.xml new file mode 100644 index 0000000..a0a801c --- /dev/null +++ b/tests/VectorDrawableTest/res/drawable/state_animation_drawable04.xml @@ -0,0 +1,26 @@ +<!-- + Copyright (C) 2014 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. +--> + +<animated-selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:id="@+id/on" android:state_checked="true" + android:drawable="@drawable/vector_drawable_favorite" /> + <item android:id="@+id/off" + android:drawable="@drawable/vector_drawable_favorite" /> + <transition android:fromId="@+id/off" android:toId="@+id/on" + android:drawable="@drawable/animation_drawable_vector" + android:reversible="true"> + </transition> +</animated-selector> diff --git a/tests/VectorDrawableTest/res/drawable/state_animation_drawable04_false.xml b/tests/VectorDrawableTest/res/drawable/state_animation_drawable04_false.xml new file mode 100644 index 0000000..3cf8e48 --- /dev/null +++ b/tests/VectorDrawableTest/res/drawable/state_animation_drawable04_false.xml @@ -0,0 +1,26 @@ +<!-- + Copyright (C) 2014 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. +--> + +<animated-selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:id="@+id/on" android:state_checked="true" + android:drawable="@drawable/vector_drawable_favorite" /> + <item android:id="@+id/off" android:state_checked="false" + android:drawable="@drawable/vector_drawable_favorite" /> + <transition android:fromId="@+id/off" android:toId="@+id/on" + android:drawable="@drawable/animation_drawable_vector" + android:reversible="false"> + </transition> +</animated-selector> diff --git a/tests/VectorDrawableTest/res/drawable/state_animation_vector_drawable01.xml b/tests/VectorDrawableTest/res/drawable/state_animation_vector_drawable01.xml index 18d7755..768fe39 100644 --- a/tests/VectorDrawableTest/res/drawable/state_animation_vector_drawable01.xml +++ b/tests/VectorDrawableTest/res/drawable/state_animation_vector_drawable01.xml @@ -17,7 +17,7 @@ <animated-selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/on" android:state_checked="true" android:drawable="@drawable/vector_drawable12" /> - <item android:id="@+id/off" + <item android:id="@+id/off" android:state_checked="false" android:drawable="@drawable/vector_drawable12" /> <transition android:fromId="@+id/off" android:toId="@+id/on" android:reversible="true"> <animated-vector android:drawable="@drawable/vector_drawable12"> diff --git a/tests/VectorDrawableTest/res/drawable/state_animation_vector_drawable01_false.xml b/tests/VectorDrawableTest/res/drawable/state_animation_vector_drawable01_false.xml new file mode 100644 index 0000000..96d378c --- /dev/null +++ b/tests/VectorDrawableTest/res/drawable/state_animation_vector_drawable01_false.xml @@ -0,0 +1,47 @@ +<!-- + Copyright (C) 2014 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. +--> + +<animated-selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:id="@+id/on" android:state_checked="true" + android:drawable="@drawable/vector_drawable12" /> + <item android:id="@+id/off" android:state_checked="false" + android:drawable="@drawable/vector_drawable12" /> + <transition android:fromId="@+id/off" android:toId="@+id/on" android:reversible="false"> + <animated-vector android:drawable="@drawable/vector_drawable12"> + <target + android:name="pie1" + android:animation="@anim/trim_path_animation01" /> + <target + android:name="v" + android:animation="@anim/trim_path_animation02" /> + <target + android:name="v" + android:animation="@anim/trim_path_animation05" /> + <target + android:name="rotationGroup" + android:animation="@anim/trim_path_animation03" /> + <target + android:name="rotationGroup3" + android:animation="@anim/trim_path_animation03" /> + <target + android:name="rotationGroupBlue" + android:animation="@anim/trim_path_animation03" /> + <target + android:name="rotationGroup" + android:animation="@anim/trim_path_animation04" /> + </animated-vector> + </transition> +</animated-selector> diff --git a/tests/VectorDrawableTest/res/drawable/state_animation_vector_drawable02_false.xml b/tests/VectorDrawableTest/res/drawable/state_animation_vector_drawable02_false.xml new file mode 100644 index 0000000..b722da1 --- /dev/null +++ b/tests/VectorDrawableTest/res/drawable/state_animation_vector_drawable02_false.xml @@ -0,0 +1,26 @@ +<!-- + Copyright (C) 2014 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. +--> + +<animated-selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:id="@+id/on" android:state_checked="true" + android:drawable="@drawable/vector_drawable_grouping_1" /> + <item android:id="@+id/off" android:state_checked="false" + android:drawable="@drawable/vector_drawable_grouping_1" /> + <transition android:fromId="@+id/off" android:toId="@+id/on" + android:drawable="@drawable/animation_vector_drawable_grouping_1" + android:reversible="false"> + </transition> +</animated-selector> diff --git a/tests/VectorDrawableTest/res/drawable/state_animation_vector_drawable03.xml b/tests/VectorDrawableTest/res/drawable/state_animation_vector_drawable03.xml index 65cf25b..e24dd1f 100644 --- a/tests/VectorDrawableTest/res/drawable/state_animation_vector_drawable03.xml +++ b/tests/VectorDrawableTest/res/drawable/state_animation_vector_drawable03.xml @@ -17,7 +17,7 @@ <animated-selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/on" android:state_checked="true" android:drawable="@drawable/vector_drawable_favorite" /> - <item android:id="@+id/off" + <item android:id="@+id/off" android:state_checked="false" android:drawable="@drawable/vector_drawable_favorite" /> <transition android:fromId="@+id/off" android:toId="@+id/on" android:drawable="@drawable/animation_vector_drawable_favorite" diff --git a/tests/VectorDrawableTest/res/drawable/state_animation_vector_drawable03_false.xml b/tests/VectorDrawableTest/res/drawable/state_animation_vector_drawable03_false.xml new file mode 100644 index 0000000..e788bc2 --- /dev/null +++ b/tests/VectorDrawableTest/res/drawable/state_animation_vector_drawable03_false.xml @@ -0,0 +1,26 @@ +<!-- + Copyright (C) 2014 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. +--> + +<animated-selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:id="@+id/on" android:state_checked="true" + android:drawable="@drawable/vector_drawable_favorite" /> + <item android:id="@+id/off" android:state_checked="false" + android:drawable="@drawable/vector_drawable_favorite" /> + <transition android:fromId="@+id/off" android:toId="@+id/on" + android:drawable="@drawable/animation_vector_drawable_favorite" + android:reversible="false"> + </transition> +</animated-selector> diff --git a/tests/VectorDrawableTest/src/com/android/test/dynamic/AnimatedStateVectorDrawableTest.java b/tests/VectorDrawableTest/src/com/android/test/dynamic/AnimatedStateVectorDrawableTest.java index 566cc4b..5386555 100644 --- a/tests/VectorDrawableTest/src/com/android/test/dynamic/AnimatedStateVectorDrawableTest.java +++ b/tests/VectorDrawableTest/src/com/android/test/dynamic/AnimatedStateVectorDrawableTest.java @@ -27,9 +27,16 @@ public class AnimatedStateVectorDrawableTest extends Activity { private static final String LOGCAT = "AnimatedStateVectorDrawableTest"; protected int[] icon = { + // These shows pairs of ASLD , the left side set the reversible to true. + // the right side set to false. R.drawable.state_animation_vector_drawable01, + R.drawable.state_animation_vector_drawable01_false, R.drawable.state_animation_vector_drawable02, + R.drawable.state_animation_vector_drawable02_false, R.drawable.state_animation_vector_drawable03, + R.drawable.state_animation_vector_drawable03_false, + R.drawable.state_animation_drawable04, + R.drawable.state_animation_drawable04_false, }; @Override @@ -39,7 +46,7 @@ public class AnimatedStateVectorDrawableTest extends Activity { ScrollView scrollView = new ScrollView(this); GridLayout container = new GridLayout(this); scrollView.addView(container); - container.setColumnCount(5); + container.setColumnCount(2); for (int i = 0; i < icon.length; i++) { CheckBox button = new CheckBox(this); |