SetupWizard: Better handle next and previous actions

Change-Id: I239269d9313594b1d37ce3468e0c095c851946c6

1 files changed, 10 insertions, 6 deletions

diff --git a/src/com/cyanogenmod/setupwizard/setup/LocationSettingsPage.java b/src/com/cyanogenmod/setupwizard/setup/LocationSettingsPage.java
index ff87054..0264599 100644
--- a/src/com/cyanogenmod/setupwizard/setup/LocationSettingsPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/LocationSettingsPage.java
@@ -17,6 +17,7 @@
 package com.cyanogenmod.setupwizard.setup;
 
 import android.app.Fragment;
+import android.app.FragmentManager;
 import android.content.ContentQueryMap;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -42,12 +43,15 @@ public class LocationSettingsPage extends SetupPage {
     }
 
     @Override
-    public Fragment getFragment() {
-        Bundle args = new Bundle();
-        args.putString(Page.KEY_PAGE_ARGUMENT, getKey());
-
-        LocationSettingsFragment fragment = new LocationSettingsFragment();
-        fragment.setArguments(args);
+    public Fragment getFragment(FragmentManager fragmentManager, int action) {
+        Fragment fragment = fragmentManager.findFragmentByTag(getKey());
+        if (fragment == null) {
+            Bundle args = new Bundle();
+            args.putString(Page.KEY_PAGE_ARGUMENT, getKey());
+            args.putInt(Page.KEY_PAGE_ACTION, action);
+            fragment = new LocationSettingsFragment();
+            fragment.setArguments(args);
+        }
         return fragment;
     }