diff options
author | Chet Haase <chet@google.com> | 2013-07-12 12:54:38 -0700 |
---|---|---|
committer | Chet Haase <chet@google.com> | 2013-07-12 13:40:38 -0700 |
commit | c81a8493884c7f432d6bd5b98aca3fbdc93b355b (patch) | |
tree | 7980d444f02c96c4ca1333efb7fdac400a5f523f /tests/TransitionTests/res | |
parent | f33468e68a6e78c6a2c88d90de4fbce55cad7eac (diff) | |
download | frameworks_base-c81a8493884c7f432d6bd5b98aca3fbdc93b355b.zip frameworks_base-c81a8493884c7f432d6bd5b98aca3fbdc93b355b.tar.gz frameworks_base-c81a8493884c7f432d6bd5b98aca3fbdc93b355b.tar.bz2 |
Fix minor transition bugs and add capabilities
Some view changes require more flexible transitions than the
defaults provided by Crossfade and TextChange - this change supplies some
of that flexibility.
Also, starting a new transition on a hierarchy undergoing a transition
caused the first to get canceled, then the start values to be retrieved.
The new transition should actually get the start values from the intermediate
state of the views, so we now cancel the previous transition only after the
start values have been captured.
Issue #9756349 Transitions: Crossfade does not handle interruption/reverse correctly
Issue #9295863 Transitions: Add behavior API/flags to various transitions
Issue #9275859 Transitions: Improve mechanism for transition interruption
Change-Id: I5a8c5a12466ddcab9e84e4880930563fa1216f3b
Diffstat (limited to 'tests/TransitionTests/res')
-rw-r--r-- | tests/TransitionTests/res/drawable-nodpi/self_portrait_square_400.jpg | bin | 0 -> 34679 bytes | |||
-rw-r--r-- | tests/TransitionTests/res/layout/crossfade_multiple.xml | 84 | ||||
-rw-r--r-- | tests/TransitionTests/res/values/strings.xml | 8 |
3 files changed, 92 insertions, 0 deletions
diff --git a/tests/TransitionTests/res/drawable-nodpi/self_portrait_square_400.jpg b/tests/TransitionTests/res/drawable-nodpi/self_portrait_square_400.jpg Binary files differnew file mode 100644 index 0000000..3923fd1 --- /dev/null +++ b/tests/TransitionTests/res/drawable-nodpi/self_portrait_square_400.jpg diff --git a/tests/TransitionTests/res/layout/crossfade_multiple.xml b/tests/TransitionTests/res/layout/crossfade_multiple.xml new file mode 100644 index 0000000..ca32ecb --- /dev/null +++ b/tests/TransitionTests/res/layout/crossfade_multiple.xml @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <RadioGroup android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <RadioButton android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:onClick="changeTransitionType" + android:id="@+id/reveal" + android:text="@string/reveal"/> + <RadioButton android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:onClick="changeTransitionType" + android:id="@+id/crossfade" + android:text="@string/crossfade"/> + <RadioButton android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:onClick="changeTransitionType" + android:id="@+id/inout" + android:text="@string/inout"/> + <RadioButton android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:onClick="changeTransitionType" + android:id="@+id/textfade1" + android:text="@string/textfade1"/> + <RadioButton android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:onClick="changeTransitionType" + android:id="@+id/textfade2" + android:text="@string/textfade2"/> + </RadioGroup> + <LinearLayout android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:onClick="sendMessage" + android:text="@string/state1" + android:id="@+id/button1"/> + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:onClick="sendMessage" + android:text="@string/state2" + android:id="@+id/button2"/> + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:onClick="sendMessage" + android:text="@string/state3" + android:id="@+id/button3"/> + </LinearLayout> + + <LinearLayout android:orientation="vertical" + android:id="@+id/container" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <Button + android:layout_width="100dip" + android:layout_height="100dip" + android:textSize="40dip" + android:text="@string/a" + android:id="@+id/button"/> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="40dip" + android:text="@string/state1" + android:id="@+id/textview"/> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/self_portrait_square_100" + android:onClick="sendMessage" + android:id="@+id/imageview"/> + </LinearLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/tests/TransitionTests/res/values/strings.xml b/tests/TransitionTests/res/values/strings.xml index 9b80a26..9cf7a94 100644 --- a/tests/TransitionTests/res/values/strings.xml +++ b/tests/TransitionTests/res/values/strings.xml @@ -49,4 +49,12 @@ <string name="button3">Button 3</string> <string name="button4">Button 4</string> <string name="button5">Button 5</string> + <string name="a">A</string> + <string name="b">B</string> + <string name="c">C</string> + <string name="reveal">Reveal</string> + <string name="crossfade">Crossfade</string> + <string name="inout">In/Out</string> + <string name="textfade1">T1</string> + <string name="textfade2">T2</string> </resources> |