commit c3f76644757394921aeeb92b90dbb9b553fbe2c5
author Mario Bertschler <bmario@google.com> Wed Jul 05 17:28:53 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 05 17:28:53 2017 +0000
tree 7aad30d008280e08ead0859f7007391e2a2aba06
parent 67058f2009d6246ced615053b840b67dccace264
parent 2de2d6781bcdf2e58da59c1eef353e35ff4cb5bb

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

src/com/android/launcher3/SettingsActivity.java

diff --git a/src/com/android/launcher3/SettingsActivity.java b/src/com/android/launcher3/SettingsActivity.java
index b7b75f8..a34e469 100644
--- a/src/com/android/launcher3/SettingsActivity.java
+++ b/src/com/android/launcher3/SettingsActivity.java
@@ -42,10 +42,12 @@
     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();
+        }
     }
 
     /**