diff options
| author | Chet Haase <chet@google.com> | 2013-06-03 07:30:21 -0700 |
|---|---|---|
| committer | Chet Haase <chet@google.com> | 2013-06-03 16:37:05 -0700 |
| commit | 867a86613d4152a93423300f83597300e6ebeebe (patch) | |
| tree | 9087a8ca942f453fb2da7555cd04c5aa2083213d /tests/TransitionTests/res/values | |
| parent | d18607980d86f03ffd838321ac3d511fa820b3e0 (diff) | |
| download | frameworks_base-867a86613d4152a93423300f83597300e6ebeebe.zip frameworks_base-867a86613d4152a93423300f83597300e6ebeebe.tar.gz frameworks_base-867a86613d4152a93423300f83597300e6ebeebe.tar.bz2 | |
Various fixes/cleanup in Scenes and Transitions
setDuration() wasn't handled correctly for TransitionGroup; it should
propagate the value to its children.
Also, videos with no ids were not being handled correctly. The transition code was
using the default id on those views (-1) to store start/end data about the view,
causing multiple non-id views to clobber values in the hashmaps. The correct approach
should be to ignore default id values - only store information about the view
instances, not about the unset ids.
Also, added a new test InterruptTest to be used to fix the current behavior of
not handling situations where new transitions start while old ones are still taking place.
Change-Id: I4e880bdbb33cc26d487bceb0d56e463e72f7621f
Diffstat (limited to 'tests/TransitionTests/res/values')
| -rw-r--r-- | tests/TransitionTests/res/values/strings.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/TransitionTests/res/values/strings.xml b/tests/TransitionTests/res/values/strings.xml index e251d5c..3be243b 100644 --- a/tests/TransitionTests/res/values/strings.xml +++ b/tests/TransitionTests/res/values/strings.xml @@ -39,4 +39,8 @@ <string name="shortText2">Not much text here</string> <string name="longText1">This is the beginning of the Spring of my discontent. In the event of a real emergency, you would be notified by email. Fear not, for death comes swiftly.</string> <string name="longText2">When do we get to eat? I like all things, especially following strong leaders, and mangy cats. Break glass in emergency. The purpose of a framework is to provide the facilities and functionality of a powerful toolkit with the simplicity of a refrigerator.</string> + <string name="state1">State 1</string> + <string name="state2">State 2</string> + <string name="state3">State 3</string> + <string name="state4">State 4</string> </resources> |