Merge "Integrate from support lib: fix restore of list state." (fd192393) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -2851,6 +2851,7 @@ package android.app {
		method public void onSaveInstanceState(android.os.Bundle);
		method public void onStart();
		method public void onStop();
		method public void onViewCreated(android.view.View, android.os.Bundle);
		method public void registerForContextMenu(android.view.View);
		method public void setArguments(android.os.Bundle);
		method public void setHasOptionsMenu(boolean);

core/java/android/app/Fragment.java

+16 −2

Original line number	Diff line number	Diff line
		@@ -326,8 +326,9 @@ public class Fragment implements ComponentCallbacks, OnCreateContextMenuListener
		static final int INITIALIZING = 0; // Not yet created.
		static final int CREATED = 1; // Created.
		static final int ACTIVITY_CREATED = 2; // The activity has finished its creation.
		static final int STARTED = 3; // Created and started, not resumed.
		static final int RESUMED = 4; // Created started and resumed.
		static final int STOPPED = 3; // Fully created, not started.
		static final int STARTED = 4; // Created and started, not resumed.
		static final int RESUMED = 5; // Created started and resumed.

		int mState = INITIALIZING;

		@@ -958,6 +959,19 @@ public class Fragment implements ComponentCallbacks, OnCreateContextMenuListener
		mCalled = true;
		}

		/**
		* Called immediately after {@link #onCreateView(LayoutInflater, ViewGroup, Bundle)}
		* has returned, but before any saved state has been restored in to the view.
		* This gives subclasses a chance to initialize themselves once
		* they know their view hierarchy has been completely created. The fragment's
		* view hierarchy is not however attached to its parent at this point.
		* @param view The View returned by {@link #onCreateView(LayoutInflater, ViewGroup, Bundle)}.
		* @param savedInstanceState If non-null, this fragment is being re-constructed
		* from a previous saved state as given here.
		*/
		public void onViewCreated(View view, Bundle savedInstanceState) {
		}

		/**
		* Called to have the fragment instantiate its user interface view.
		* This is optional, and non-graphical fragments can return null (which

core/java/android/app/FragmentManager.java

+13 −7

Original line number	Diff line number	Diff line
		@@ -714,13 +714,14 @@ final class FragmentManagerImpl extends FragmentManager {
		null, f.mSavedFragmentState);
		if (f.mView != null) {
		f.mView.setSaveFromParentEnabled(false);
		f.restoreViewState();
		if (f.mHidden) f.mView.setVisibility(View.GONE);
		f.restoreViewState();
		f.onViewCreated(f.mView, f.mSavedFragmentState);
		}
		}
		case Fragment.CREATED:
		if (newState > Fragment.CREATED) {
		if (DEBUG) Log.v(TAG, "moveto CONTENT: " + f);
		if (DEBUG) Log.v(TAG, "moveto ACTIVITY_CREATED: " + f);
		if (!f.mFromLayout) {
		ViewGroup container = null;
		if (f.mContainerId != 0) {
		@@ -744,9 +745,10 @@ final class FragmentManagerImpl extends FragmentManager {
		anim.start();
		}
		container.addView(f.mView);
		f.restoreViewState();
		}
		if (f.mHidden) f.mView.setVisibility(View.GONE);
		f.restoreViewState();
		f.onViewCreated(f.mView, f.mSavedFragmentState);
		}
		}

		@@ -756,10 +758,13 @@ final class FragmentManagerImpl extends FragmentManager {
		throw new SuperNotCalledException("Fragment " + f
		+ " did not call through to super.onActivityCreated()");
		}
		if (f.mView != null) {
		}
		f.mSavedFragmentState = null;
		}
		case Fragment.ACTIVITY_CREATED:
		if (newState > Fragment.ACTIVITY_CREATED) {
		case Fragment.STOPPED:
		if (newState > Fragment.STOPPED) {
		if (DEBUG) Log.v(TAG, "moveto STARTED: " + f);
		f.mCalled = false;
		f.onStart();
		@@ -803,9 +808,10 @@ final class FragmentManagerImpl extends FragmentManager {
		+ " did not call through to super.onStop()");
		}
		}
		case Fragment.STOPPED:
		case Fragment.ACTIVITY_CREATED:
		if (newState < Fragment.ACTIVITY_CREATED) {
		if (DEBUG) Log.v(TAG, "movefrom CONTENT: " + f);
		if (DEBUG) Log.v(TAG, "movefrom ACTIVITY_CREATED: " + f);
		if (f.mView != null) {
		// Need to save the current view state if not
		// done already.
		@@ -1631,7 +1637,7 @@ final class FragmentManagerImpl extends FragmentManager {
		}

		public void dispatchStop() {
		moveToState(Fragment.ACTIVITY_CREATED, false);
		moveToState(Fragment.STOPPED, false);
		}

		public void dispatchDestroy() {

core/java/android/app/ListFragment.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -195,11 +195,11 @@ public class ListFragment extends Fragment {
		}

		/**
		* Attach to list view once Fragment is ready to run.
		* Attach to list view once the view hierarchy has been created.
		*/
		@Override
		public void onActivityCreated(Bundle savedInstanceState) {
		super.onActivityCreated(savedInstanceState);
		public void onViewCreated(View view, Bundle savedInstanceState) {
		super.onViewCreated(view, savedInstanceState);
		ensureList();
		}