drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2

Browse Source
This commit is contained in:
Dianne Hackborn
2011-06-03 17:52:23 -07:00
committed by Android (Google) Code Review
parent e7d6007872 1333276c7a
commit bd754205d0
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/app/FragmentManager.java
View File

@ -1109,7 +1109,6 @@ final class FragmentManagerImpl extends FragmentManager {
mNeedMenuInvalidate = true; mNeedMenuInvalidate = true;
} }
fragment.mAdded = false; fragment.mAdded = false;
fragment.mRemoving = true;
moveToState(fragment, Fragment.CREATED, transition, transitionStyle); moveToState(fragment, Fragment.CREATED, transition, transitionStyle);
} }
} }
@ -1122,7 +1121,6 @@ final class FragmentManagerImpl extends FragmentManager {
if (!fragment.mAdded) { if (!fragment.mAdded) {
mAdded.add(fragment); mAdded.add(fragment);
fragment.mAdded = true; fragment.mAdded = true;
fragment.mRemoving = false;
if (fragment.mHasMenu) { if (fragment.mHasMenu) {
mNeedMenuInvalidate = true; mNeedMenuInvalidate = true;
} }
@ -1435,13 +1433,13 @@ final class FragmentManagerImpl extends FragmentManager {
if (f.mView != null) { if (f.mView != null) {
saveFragmentViewState(f); saveFragmentViewState(f);
if (f.mSavedViewState != null) { }
if (result == null) { if (f.mSavedViewState != null) {
result = new Bundle(); if (result == null) {
} result = new Bundle();
result.putSparseParcelableArray(
FragmentManagerImpl.VIEW_STATE_TAG, f.mSavedViewState);
} }
result.putSparseParcelableArray(
FragmentManagerImpl.VIEW_STATE_TAG, f.mSavedViewState);
} }
return result; return result;