OSDN Git Service

Make fragments use the new animation system
authorChet Haase <chet@google.com>
Wed, 11 Aug 2010 19:14:11 +0000 (12:14 -0700)
committerChet Haase <chet@google.com>
Wed, 11 Aug 2010 23:41:49 +0000 (16:41 -0700)
Change-Id: I20b200c285336066d96cdb9cc37287d1168a1874

samples/ApiDemos/src/com/example/android/apis/app/FragmentAnim.java
samples/ApiDemos/src/com/example/android/apis/app/FragmentStack.java

index 4991383..42345a0 100644 (file)
@@ -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));
index a7e9985..6440cbd 100644 (file)
@@ -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();
     }