Merge "Settings: only replace content with new fragment if it has no saved instance state." into ub-launcher3-dorval-polish

am: c3f7664475

Change-Id: Ie802edcfc44df01fd8bfbf36fbfb913544285bb0

src/com/android/launcher3/SettingsActivity.java

@@ -42,10 +42,12 @@ public class SettingsActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        // Display the fragment as the main content.
-        getFragmentManager().beginTransaction()
-                .replace(android.R.id.content, new LauncherSettingsFragment())
-                .commit();
+        if (savedInstanceState == null) {
+            // Display the fragment as the main content.
+            getFragmentManager().beginTransaction()
+                    .replace(android.R.id.content, new LauncherSettingsFragment())
+                    .commit();
+        }
     }
 
     /**