Merge "Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled" into ics-mr1

adamp · Android (Google) Code Review · commit b41d9f8a84a3 · 2011-11-02T15:44:31.000-07:00
diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java
@@ -725,8 +725,9 @@ void moveToState(Fragment f, int newState, int transit, int transitionStyle) {
             // While removing a fragment, we can't change it to a higher state.
             newState = f.mState;
         }
-        // Defer start if requested; don't allow it to move to STARTED or higher.
-        if (f.mDeferStart && newState > Fragment.STOPPED) {
+        // Defer start if requested; don't allow it to move to STARTED or higher
+        // if it's not already started.
+        if (f.mDeferStart && f.mState < Fragment.STARTED && newState > Fragment.STOPPED) {
             newState = Fragment.STOPPED;
         }
         if (f.mState < newState) {

Original file line number	Diff line number	Diff line change
`@@ -725,8 +725,9 @@ void moveToState(Fragment f, int newState, int transit, int transitionStyle) {`
`725`	`725`	`// While removing a fragment, we can't change it to a higher state.`
`726`	`726`	`newState = f.mState;`
`727`	`727`	`}`
`728`		`- // Defer start if requested; don't allow it to move to STARTED or higher.`
`729`		`- if (f.mDeferStart && newState > Fragment.STOPPED) {`
	`728`	`+ // Defer start if requested; don't allow it to move to STARTED or higher`
	`729`	`+ // if it's not already started.`
	`730`	`+ if (f.mDeferStart && f.mState < Fragment.STARTED && newState > Fragment.STOPPED) {`
`730`	`731`	`newState = Fragment.STOPPED;`
`731`	`732`	`}`
`732`	`733`	`if (f.mState < newState) {`