diff options
4 files changed, 12 insertions, 16 deletions
diff --git a/v4/java/android/support/v4/app/Fragment.java b/v4/java/android/support/v4/app/Fragment.java index 79f21ff746..48fc495bf3 100644 --- a/v4/java/android/support/v4/app/Fragment.java +++ b/v4/java/android/support/v4/app/Fragment.java @@ -272,9 +272,6 @@ public class Fragment implements ComponentCallbacks, OnCreateContextMenuListener // If set this fragment is being retained across the current config change. boolean mRetaining; - - // If set this fragment's loaders are being retained across the current config change. - boolean mRetainLoader; // If set this fragment has menu items to contribute. boolean mHasMenu; @@ -2153,7 +2150,7 @@ public class Fragment implements ComponentCallbacks, OnCreateContextMenuListener mLoaderManager = mHost.getLoaderManager(mWho, mLoadersStarted, false); } if (mLoaderManager != null) { - if (mRetainLoader) { + if (mHost.getRetainLoaders()) { mLoaderManager.doRetain(); } else { mLoaderManager.doStop(); diff --git a/v4/java/android/support/v4/app/FragmentController.java b/v4/java/android/support/v4/app/FragmentController.java index dbf9ee71e0..5d647b061a 100644 --- a/v4/java/android/support/v4/app/FragmentController.java +++ b/v4/java/android/support/v4/app/FragmentController.java @@ -346,7 +346,6 @@ public class FragmentController { */ public void doLoaderStop(boolean retain) { mHost.doLoaderStop(retain); - mHost.mFragmentManager.setRetainLoader(retain); } /** diff --git a/v4/java/android/support/v4/app/FragmentHostCallback.java b/v4/java/android/support/v4/app/FragmentHostCallback.java index fb4410f0d0..5d6145ad71 100644 --- a/v4/java/android/support/v4/app/FragmentHostCallback.java +++ b/v4/java/android/support/v4/app/FragmentHostCallback.java @@ -42,9 +42,14 @@ public abstract class FragmentHostCallback<E> extends FragmentContainer { private final Handler mHandler; final int mWindowAnimations; final FragmentManagerImpl mFragmentManager = new FragmentManagerImpl(); + /** The loader managers for individual fragments [i.e. Fragment#getLoaderManager()] */ private SimpleArrayMap<String, LoaderManager> mAllLoaderManagers; + /** Whether or not fragment loaders should retain their state */ + private boolean mRetainLoaders; + /** The loader manger for the fragment host [i.e. Activity#getLoaderManager()] */ private LoaderManagerImpl mLoaderManager; private boolean mCheckedForLoaderManager; + /** Whether or not the fragment host loader manager was started */ private boolean mLoadersStarted; public FragmentHostCallback(Context context, Handler handler, int windowAnimations) { @@ -197,6 +202,10 @@ public abstract class FragmentHostCallback<E> extends FragmentContainer { void onAttachFragment(Fragment fragment) { } + boolean getRetainLoaders() { + return mRetainLoaders; + } + void doLoaderStart() { if (mLoadersStarted) { return; @@ -217,6 +226,8 @@ public abstract class FragmentHostCallback<E> extends FragmentContainer { // retain -- whether to stop the loader or retain it void doLoaderStop(boolean retain) { + mRetainLoaders = retain; + if (mLoaderManager == null) { return; } diff --git a/v4/java/android/support/v4/app/FragmentManager.java b/v4/java/android/support/v4/app/FragmentManager.java index 048dc1ae51..adf8892a2f 100644 --- a/v4/java/android/support/v4/app/FragmentManager.java +++ b/v4/java/android/support/v4/app/FragmentManager.java @@ -918,17 +918,6 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate } } - void setRetainLoader(boolean retain) { - if (mActive != null) { - for (int i=0; i<mActive.size(); i++) { - Fragment f = mActive.get(i); - if (f != null) { - f.mRetainLoader = retain; - } - } - } - } - void moveToState(Fragment f, int newState, int transit, int transitionStyle, boolean keepActive) { // Fragments that are not currently added will sit in the onCreate() state. |