3 files changed, 16 insertions, 3 deletions
diff --git a/src/com/cyanogenmod/setupwizard/setup/AbstractSetupData.java b/src/com/cyanogenmod/setupwizard/setup/AbstractSetupData.java
index d78da8e..c15900f 100644
--- a/src/com/cyanogenmod/setupwizard/setup/AbstractSetupData.java
+++ b/src/com/cyanogenmod/setupwizard/setup/AbstractSetupData.java
@@ -191,6 +191,13 @@ public abstract class AbstractSetupData extends BroadcastReceiver implements Set
         }
     }
 
+    @Override
+    public void addFinishRunnable(Runnable runnable) {
+        for (int i = 0; i < mListeners.size(); i++) {
+            mListeners.get(i).addFinishRunnable(runnable);
+        }
+    }
+
     public Bundle save() {
         Bundle bundle = new Bundle();
         for (Page page : mPageList.values()) {
diff --git a/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java b/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
index 2ff4afa..49b04ee 100644
--- a/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
+++ b/src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java
@@ -123,9 +123,14 @@ public class CyanogenSettingsPage extends SetupPage {
 
     @Override
     public void onFinishSetup() {
-        if (getData().containsKey(KEY_ENABLE_NAV_KEYS)) {
-            writeDisableNavkeysOption(mContext, getData().getBoolean(KEY_ENABLE_NAV_KEYS));
-        }
+        getCallbacks().addFinishRunnable(new Runnable() {
+            @Override
+            public void run() {
+                if (getData().containsKey(KEY_ENABLE_NAV_KEYS)) {
+                    writeDisableNavkeysOption(mContext, getData().getBoolean(KEY_ENABLE_NAV_KEYS));
+                }
+            }
+        });
         handleWhisperPushRegistration();
         handleEnableMetrics();
         handleDefaultThemeSetup();
diff --git a/src/com/cyanogenmod/setupwizard/setup/SetupDataCallbacks.java b/src/com/cyanogenmod/setupwizard/setup/SetupDataCallbacks.java
index b4127a6..6b4982b 100644
--- a/src/com/cyanogenmod/setupwizard/setup/SetupDataCallbacks.java
+++ b/src/com/cyanogenmod/setupwizard/setup/SetupDataCallbacks.java
@@ -26,4 +26,5 @@ public interface SetupDataCallbacks {
     boolean isCurrentPage(Page page);
     Page getPage(String key);
     Page getPage(int key);
+    void addFinishRunnable(Runnable runnable);
 }