Merge "Eagerly update fragment state when moving between states" (0c575969) · Commits · e / os / android_frameworks_base

core/java/android/app/Fragment.java

+9 −6

Original line number	Diff line number	Diff line
		@@ -409,9 +409,6 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
		// If set this fragment is being removed from its activity.
		boolean mRemoving;

		// True if the fragment is in the resumed state.
		boolean mResumed;

		// Set to true if this fragment was instantiated from a layout file.
		boolean mFromLayout;

		@@ -928,7 +925,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
		* for the duration of {@link #onResume()} and {@link #onPause()} as well.
		*/
		final public boolean isResumed() {
		return mResumed;
		return mState >= RESUMED;
		}

		/**
		@@ -1630,7 +1627,6 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
		mWho = null;
		mAdded = false;
		mRemoving = false;
		mResumed = false;
		mFromLayout = false;
		mInLayout = false;
		mRestored = false;
		@@ -2113,7 +2109,6 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
		writer.print(" mBackStackNesting="); writer.println(mBackStackNesting);
		writer.print(prefix); writer.print("mAdded="); writer.print(mAdded);
		writer.print(" mRemoving="); writer.print(mRemoving);
		writer.print(" mResumed="); writer.print(mResumed);
		writer.print(" mFromLayout="); writer.print(mFromLayout);
		writer.print(" mInLayout="); writer.println(mInLayout);
		writer.print(prefix); writer.print("mHidden="); writer.print(mHidden);
		@@ -2208,6 +2203,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
		if (mChildFragmentManager != null) {
		mChildFragmentManager.noteStateNotSaved();
		}
		mState = CREATED;
		mCalled = false;
		onCreate(savedInstanceState);
		if (!mCalled) {
		@@ -2238,6 +2234,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
		if (mChildFragmentManager != null) {
		mChildFragmentManager.noteStateNotSaved();
		}
		mState = ACTIVITY_CREATED;
		mCalled = false;
		onActivityCreated(savedInstanceState);
		if (!mCalled) {
		@@ -2254,6 +2251,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
		mChildFragmentManager.noteStateNotSaved();
		mChildFragmentManager.execPendingActions();
		}
		mState = STARTED;
		mCalled = false;
		onStart();
		if (!mCalled) {
		@@ -2273,6 +2271,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
		mChildFragmentManager.noteStateNotSaved();
		mChildFragmentManager.execPendingActions();
		}
		mState = RESUMED;
		mCalled = false;
		onResume();
		if (!mCalled) {
		@@ -2389,6 +2388,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
		if (mChildFragmentManager != null) {
		mChildFragmentManager.dispatchPause();
		}
		mState = STARTED;
		mCalled = false;
		onPause();
		if (!mCalled) {
		@@ -2401,6 +2401,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
		if (mChildFragmentManager != null) {
		mChildFragmentManager.dispatchStop();
		}
		mState = STOPPED;
		mCalled = false;
		onStop();
		if (!mCalled) {
		@@ -2428,6 +2429,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
		if (mChildFragmentManager != null) {
		mChildFragmentManager.dispatchDestroyView();
		}
		mState = CREATED;
		mCalled = false;
		onDestroyView();
		if (!mCalled) {
		@@ -2443,6 +2445,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
		if (mChildFragmentManager != null) {
		mChildFragmentManager.dispatchDestroy();
		}
		mState = INITIALIZING;
		mCalled = false;
		onDestroy();
		if (!mCalled) {

core/java/android/app/FragmentManager.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -1004,7 +1004,6 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
		case Fragment.STARTED:
		if (newState > Fragment.STARTED) {
		if (DEBUG) Log.v(TAG, "moveto RESUMED: " + f);
		f.mResumed = true;
		f.performResume();
		// Get rid of this in case we saved it and never needed it.
		f.mSavedFragmentState = null;
		@@ -1017,7 +1016,6 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
		if (newState < Fragment.RESUMED) {
		if (DEBUG) Log.v(TAG, "movefrom RESUMED: " + f);
		f.performPause();
		f.mResumed = false;
		}
		case Fragment.STARTED:
		if (newState < Fragment.STARTED) {
		@@ -1096,6 +1094,8 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
		if (DEBUG) Log.v(TAG, "movefrom CREATED: " + f);
		if (!f.mRetaining) {
		f.performDestroy();
		} else {
		f.mState = Fragment.INITIALIZING;
		}

		f.mCalled = false;
		@@ -1119,8 +1119,12 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
		}
		}

		if (f.mState != newState) {
		Log.w(TAG, "moveToState: Fragment state for " + f + " not updated inline; "
		+ "expected state " + newState + " found " + f.mState);
		f.mState = newState;
		}
		}

		void moveToState(Fragment f) {
		moveToState(f, mCurState, 0, 0, false);