diff options
| author | Chet Haase <chet@google.com> | 2013-10-23 07:11:25 -0700 |
|---|---|---|
| committer | Chet Haase <chet@google.com> | 2013-10-23 07:14:03 -0700 |
| commit | 69ae34b2b9b65f13c70404356327666a44b5a542 (patch) | |
| tree | 41cb55d9830869afd670251ffdee9bab1d4ae3a1 /samples | |
| parent | 30278c6f481ac0e10459337d84f421c68583abbf (diff) | |
| download | android_development-69ae34b2b9b65f13c70404356327666a44b5a542.tar.gz android_development-69ae34b2b9b65f13c70404356327666a44b5a542.tar.bz2 android_development-69ae34b2b9b65f13c70404356327666a44b5a542.zip | |
Fix ApiDemo for transitions
The demo used an obsolete/wrong tag name for TransitionSet
(set, instead of the correct transitionSet). This caused the demo
to crash at runtime and to produce incorrect example docs in the
Transition reference pages.
Issue #11346546 Transition ApiDemo crashes
Change-Id: I12142870ac4f7412e5809b9cdad3ca3015449d77
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/ApiDemos/res/transition/changebounds_fadein_together.xml | 4 | ||||
| -rw-r--r-- | samples/ApiDemos/res/transition/changebounds_fadeout_sequential.xml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/samples/ApiDemos/res/transition/changebounds_fadein_together.xml b/samples/ApiDemos/res/transition/changebounds_fadein_together.xml index c0bb26f22..3a356538e 100644 --- a/samples/ApiDemos/res/transition/changebounds_fadein_together.xml +++ b/samples/ApiDemos/res/transition/changebounds_fadein_together.xml @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -<set xmlns:android="http://schemas.android.com/apk/res/android"> +<transitionSet xmlns:android="http://schemas.android.com/apk/res/android"> <changeBounds/> <fade android:fadingMode="fade_in" > <targets> <target android:targetId="@id/grayscaleContainer" /> </targets> </fade> -</set> +</transitionSet> diff --git a/samples/ApiDemos/res/transition/changebounds_fadeout_sequential.xml b/samples/ApiDemos/res/transition/changebounds_fadeout_sequential.xml index df3630631..4734135c5 100644 --- a/samples/ApiDemos/res/transition/changebounds_fadeout_sequential.xml +++ b/samples/ApiDemos/res/transition/changebounds_fadeout_sequential.xml @@ -14,7 +14,7 @@ limitations under the License. --> <!-- BEGIN_INCLUDE(TransitionSet) --> -<set xmlns:android="http://schemas.android.com/apk/res/android" +<transitionSet xmlns:android="http://schemas.android.com/apk/res/android" android:transitionOrdering="sequential"> <changeBounds/> <fade android:fadingMode="fade_out" > @@ -22,5 +22,5 @@ <target android:targetId="@id/grayscaleContainer" /> </targets> </fade> -</set> +</transitionSet> <!-- END_INCLUDE(TransitionSet) --> |