diff --git a/api/current.txt b/api/current.txt index 9db86bf16ab29..07f1fb1f58fc9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -4818,6 +4818,7 @@ package android.app { method public void onFragmentDetached(android.app.FragmentManager, android.app.Fragment); method public void onFragmentPaused(android.app.FragmentManager, android.app.Fragment); method public void onFragmentPreAttached(android.app.FragmentManager, android.app.Fragment, android.content.Context); + method public void onFragmentPreCreated(android.app.FragmentManager, android.app.Fragment, android.os.Bundle); method public void onFragmentResumed(android.app.FragmentManager, android.app.Fragment); method public void onFragmentSaveInstanceState(android.app.FragmentManager, android.app.Fragment, android.os.Bundle); method public void onFragmentStarted(android.app.FragmentManager, android.app.Fragment); @@ -4850,10 +4851,10 @@ package android.app { method public abstract android.app.FragmentTransaction hide(android.app.Fragment); method public abstract boolean isAddToBackStackAllowed(); method public abstract boolean isEmpty(); - method public abstract android.app.FragmentTransaction postOnCommit(java.lang.Runnable); method public abstract android.app.FragmentTransaction remove(android.app.Fragment); method public abstract android.app.FragmentTransaction replace(int, android.app.Fragment); method public abstract android.app.FragmentTransaction replace(int, android.app.Fragment, java.lang.String); + method public abstract android.app.FragmentTransaction runOnCommit(java.lang.Runnable); method public abstract android.app.FragmentTransaction setBreadCrumbShortTitle(int); method public abstract android.app.FragmentTransaction setBreadCrumbShortTitle(java.lang.CharSequence); method public abstract android.app.FragmentTransaction setBreadCrumbTitle(int); diff --git a/api/system-current.txt b/api/system-current.txt index a154f9ea9e169..29aceace4cfaa 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4986,6 +4986,7 @@ package android.app { method public void onFragmentDetached(android.app.FragmentManager, android.app.Fragment); method public void onFragmentPaused(android.app.FragmentManager, android.app.Fragment); method public void onFragmentPreAttached(android.app.FragmentManager, android.app.Fragment, android.content.Context); + method public void onFragmentPreCreated(android.app.FragmentManager, android.app.Fragment, android.os.Bundle); method public void onFragmentResumed(android.app.FragmentManager, android.app.Fragment); method public void onFragmentSaveInstanceState(android.app.FragmentManager, android.app.Fragment, android.os.Bundle); method public void onFragmentStarted(android.app.FragmentManager, android.app.Fragment); @@ -5018,10 +5019,10 @@ package android.app { method public abstract android.app.FragmentTransaction hide(android.app.Fragment); method public abstract boolean isAddToBackStackAllowed(); method public abstract boolean isEmpty(); - method public abstract android.app.FragmentTransaction postOnCommit(java.lang.Runnable); method public abstract android.app.FragmentTransaction remove(android.app.Fragment); method public abstract android.app.FragmentTransaction replace(int, android.app.Fragment); method public abstract android.app.FragmentTransaction replace(int, android.app.Fragment, java.lang.String); + method public abstract android.app.FragmentTransaction runOnCommit(java.lang.Runnable); method public abstract android.app.FragmentTransaction setBreadCrumbShortTitle(int); method public abstract android.app.FragmentTransaction setBreadCrumbShortTitle(java.lang.CharSequence); method public abstract android.app.FragmentTransaction setBreadCrumbTitle(int); diff --git a/api/test-current.txt b/api/test-current.txt index b7ff8f5034b43..02034c09cdacb 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -4831,6 +4831,7 @@ package android.app { method public void onFragmentDetached(android.app.FragmentManager, android.app.Fragment); method public void onFragmentPaused(android.app.FragmentManager, android.app.Fragment); method public void onFragmentPreAttached(android.app.FragmentManager, android.app.Fragment, android.content.Context); + method public void onFragmentPreCreated(android.app.FragmentManager, android.app.Fragment, android.os.Bundle); method public void onFragmentResumed(android.app.FragmentManager, android.app.Fragment); method public void onFragmentSaveInstanceState(android.app.FragmentManager, android.app.Fragment, android.os.Bundle); method public void onFragmentStarted(android.app.FragmentManager, android.app.Fragment); @@ -4863,10 +4864,10 @@ package android.app { method public abstract android.app.FragmentTransaction hide(android.app.Fragment); method public abstract boolean isAddToBackStackAllowed(); method public abstract boolean isEmpty(); - method public abstract android.app.FragmentTransaction postOnCommit(java.lang.Runnable); method public abstract android.app.FragmentTransaction remove(android.app.Fragment); method public abstract android.app.FragmentTransaction replace(int, android.app.Fragment); method public abstract android.app.FragmentTransaction replace(int, android.app.Fragment, java.lang.String); + method public abstract android.app.FragmentTransaction runOnCommit(java.lang.Runnable); method public abstract android.app.FragmentTransaction setBreadCrumbShortTitle(int); method public abstract android.app.FragmentTransaction setBreadCrumbShortTitle(java.lang.CharSequence); method public abstract android.app.FragmentTransaction setBreadCrumbTitle(int); diff --git a/core/java/android/app/BackStackRecord.java b/core/java/android/app/BackStackRecord.java index 65c5b4f702b21..46e6defbb41ae 100644 --- a/core/java/android/app/BackStackRecord.java +++ b/core/java/android/app/BackStackRecord.java @@ -621,7 +621,7 @@ final class BackStackRecord extends FragmentTransaction implements } @Override - public FragmentTransaction postOnCommit(Runnable runnable) { + public FragmentTransaction runOnCommit(Runnable runnable) { if (runnable == null) { throw new IllegalArgumentException("runnable cannot be null"); } diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java index fdd1b7e723523..63c0ef33ff366 100644 --- a/core/java/android/app/FragmentManager.java +++ b/core/java/android/app/FragmentManager.java @@ -451,6 +451,18 @@ public abstract class FragmentManager { */ public void onFragmentAttached(FragmentManager fm, Fragment f, Context context) {} + /** + * Called right before the fragment's {@link Fragment#onCreate(Bundle)} method is called. + * This is a good time to inject any required dependencies or perform other configuration + * for the fragment. + * + * @param fm Host FragmentManager + * @param f Fragment changing state + * @param savedInstanceState Saved instance bundle from a previous instance + */ + public void onFragmentPreCreated(FragmentManager fm, Fragment f, + Bundle savedInstanceState) {} + /** * Called after the fragment has returned from the FragmentManager's call to * {@link Fragment#onCreate(Bundle)}. This will only happen once for any given @@ -1218,6 +1230,7 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate dispatchOnFragmentAttached(f, mHost.getContext(), false); if (!f.mRetaining) { + dispatchOnFragmentPreCreated(f, f.mSavedFragmentState, false); f.performCreate(f.mSavedFragmentState); dispatchOnFragmentCreated(f, f.mSavedFragmentState, false); } else { @@ -3274,6 +3287,25 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate } } + void dispatchOnFragmentPreCreated(Fragment f, Bundle savedInstanceState, + boolean onlyRecursive) { + if (mParent != null) { + FragmentManager parentManager = mParent.getFragmentManager(); + if (parentManager instanceof FragmentManagerImpl) { + ((FragmentManagerImpl) parentManager) + .dispatchOnFragmentPreCreated(f, savedInstanceState, true); + } + } + if (mLifecycleCallbacks == null) { + return; + } + for (Pair p : mLifecycleCallbacks) { + if (!onlyRecursive || p.second) { + p.first.onFragmentPreCreated(this, f, savedInstanceState); + } + } + } + void dispatchOnFragmentCreated(Fragment f, Bundle savedInstanceState, boolean onlyRecursive) { if (mParent != null) { FragmentManager parentManager = mParent.getFragmentManager(); diff --git a/core/java/android/app/FragmentTransaction.java b/core/java/android/app/FragmentTransaction.java index a0e5a4ec6f1f8..c910e9035a3f1 100644 --- a/core/java/android/app/FragmentTransaction.java +++ b/core/java/android/app/FragmentTransaction.java @@ -315,14 +315,22 @@ public abstract class FragmentTransaction { * in this transaction may have been optimized out due to the presence of a subsequent * fragment transaction in the batch. * - *

postOnCommit may not be used with transactions + * + *

If a transaction is committed using {@link #commitAllowingStateLoss()} this runnable + * may be executed when the FragmentManager is in a state where new transactions may not + * be committed without allowing state loss.

+ * + *

runOnCommit may not be used with transactions * {@link #addToBackStack(String) added to the back stack} as Runnables cannot be persisted - * with back stack state.

+ * with back stack state. {@link IllegalStateException} will be thrown if + * {@link #addToBackStack(String)} has been previously called for this transaction + * or if it is called after a call to runOnCommit.

* * @param runnable Runnable to add * @return this FragmentTransaction + * @throws IllegalStateException if {@link #addToBackStack(String)} has been called */ - public abstract FragmentTransaction postOnCommit(Runnable runnable); + public abstract FragmentTransaction runOnCommit(Runnable runnable); /** * Schedules a commit of this transaction. The commit does