From 84df83a5e28f0eabfe7979e64abc6c73e05731d6 Mon Sep 17 00:00:00 2001 From: Chet Haase Date: Wed, 11 Aug 2010 12:14:11 -0700 Subject: [PATCH] Make fragments use the new animation system Change-Id: I20b200c285336066d96cdb9cc37287d1168a1874 --- .../src/com/example/android/apis/app/FragmentAnim.java | 3 ++- .../src/com/example/android/apis/app/FragmentStack.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/samples/ApiDemos/src/com/example/android/apis/app/FragmentAnim.java b/samples/ApiDemos/src/com/example/android/apis/app/FragmentAnim.java index 4991383c3..42345a02c 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/FragmentAnim.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/FragmentAnim.java @@ -49,7 +49,8 @@ public class FragmentAnim extends Activity { button.setOnClickListener(new OnClickListener() { public void onClick(View v) { FragmentTransaction ft = openFragmentTransaction(); - ft.setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out); + ft.setCustomAnimations(android.R.anim.animator_fade_in, + android.R.anim.animator_fade_out); if (fragment.isHidden()) { button.setAnimation(AnimationUtils.loadAnimation( FragmentAnim.this, android.R.anim.slide_in_left)); diff --git a/samples/ApiDemos/src/com/example/android/apis/app/FragmentStack.java b/samples/ApiDemos/src/com/example/android/apis/app/FragmentStack.java index a7e99855a..6440cbd48 100644 --- a/samples/ApiDemos/src/com/example/android/apis/app/FragmentStack.java +++ b/samples/ApiDemos/src/com/example/android/apis/app/FragmentStack.java @@ -66,7 +66,7 @@ public class FragmentStack extends Activity { Fragment newFragment = new CountingFragment(mStackLevel); FragmentTransaction ft = openFragmentTransaction(); ft.replace(R.id.simple_fragment, newFragment); - ft.setTransition(FragmentTransaction.TRANSIT_WALLPAPER_INTRA_OPEN); + ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN); ft.addToBackStack(null); ft.commit(); }