diff options
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/DialogFragment.java | 4 | ||||
| -rw-r--r-- | core/java/android/app/FragmentManager.java | 9 | ||||
| -rw-r--r-- | core/java/android/app/LoaderManager.java | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/core/java/android/app/DialogFragment.java b/core/java/android/app/DialogFragment.java index 6194240..6f25293 100644 --- a/core/java/android/app/DialogFragment.java +++ b/core/java/android/app/DialogFragment.java @@ -218,7 +218,7 @@ public class DialogFragment extends Fragment * {@link FragmentTransaction#add(Fragment, String) FragmentTransaction.add}. */ public void show(FragmentManager manager, String tag) { - FragmentTransaction ft = manager.openTransaction(); + FragmentTransaction ft = manager.beginTransaction(); ft.add(this, tag); ft.commit(); } @@ -260,7 +260,7 @@ public class DialogFragment extends Fragment FragmentManager.POP_BACK_STACK_INCLUSIVE); mBackStackId = -1; } else { - FragmentTransaction ft = getFragmentManager().openTransaction(); + FragmentTransaction ft = getFragmentManager().beginTransaction(); ft.remove(this); if (allowStateLoss) { ft.commitAllowingStateLoss(); diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java index eb9b8a3..e35ef87 100644 --- a/core/java/android/app/FragmentManager.java +++ b/core/java/android/app/FragmentManager.java @@ -100,8 +100,13 @@ public abstract class FragmentManager { * in the state, and if changes are made after the state is saved then they * will be lost.</p> */ - public abstract FragmentTransaction openTransaction(); + public abstract FragmentTransaction beginTransaction(); + /** Old API */ + public FragmentTransaction openTransaction() { + return beginTransaction(); + } + /** * After a {@link FragmentTransaction} is committed with * {@link FragmentTransaction#commit FragmentTransaction.commit()}, it @@ -347,7 +352,7 @@ final class FragmentManagerImpl extends FragmentManager { }; @Override - public FragmentTransaction openTransaction() { + public FragmentTransaction beginTransaction() { return new BackStackRecord(this); } diff --git a/core/java/android/app/LoaderManager.java b/core/java/android/app/LoaderManager.java index 1ef011c..cd5e3bb 100644 --- a/core/java/android/app/LoaderManager.java +++ b/core/java/android/app/LoaderManager.java @@ -60,7 +60,7 @@ public abstract class LoaderManager { * Called when a previously created loader has finished its load. Note * that normally an application is <em>not</em> allowed to commit fragment * transactions while in this call, since it can happen after an - * activity's state is saved. See {@link FragmentManager#openTransaction() + * activity's state is saved. See {@link FragmentManager#beginTransaction() * FragmentManager.openTransaction()} for further discussion on this. * * <p>This function is guaranteed to be called prior to the release of |