commit 601a8582d0f761a85b6eb16e7a6b78402f6f2599
author Tadashi G. Takaoka <takaoka@google.com> Wed Mar 13 07:52:34 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 13 07:52:35 2013 +0000
tree 28140af3b1e85da2d3ac1698b2ee96884d3a42f3
parent 0ab44b21bd6ef5e9fde329b25dfd84f6ca5c0825
parent 24cea7f1fb6be4143560239169e6e807ccd57594

Merge "Move checking non-persistent checkbox to onResume" into jb-mr2-dev

java/src/com/android/inputmethod/latin/SettingsFragment.java

diff --git a/java/src/com/android/inputmethod/latin/SettingsFragment.java b/java/src/com/android/inputmethod/latin/SettingsFragment.java
index d305285..cc9f168 100644
--- a/java/src/com/android/inputmethod/latin/SettingsFragment.java
+++ b/java/src/com/android/inputmethod/latin/SettingsFragment.java
@@ -156,10 +156,6 @@
             removePreference(Settings.PREF_GESTURE_SETTINGS, getPreferenceScreen());
         }
 
-        final CheckBoxPreference showSetupWizardIcon =
-                (CheckBoxPreference)findPreference(Settings.PREF_SHOW_SETUP_WIZARD_ICON);
-        showSetupWizardIcon.setChecked(Settings.readShowSetupWizardIcon(prefs, context));
-
         setupKeyLongpressTimeoutSettings(prefs, res);
         setupKeypressVibrationDurationSettings(prefs, res);
         setupKeypressSoundVolumeSettings(prefs, res);
@@ -175,6 +171,10 @@
         } else {
             getPreferenceScreen().removePreference(mVoicePreference);
         }
+        final SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
+        final CheckBoxPreference showSetupWizardIcon =
+                (CheckBoxPreference)findPreference(Settings.PREF_SHOW_SETUP_WIZARD_ICON);
+        showSetupWizardIcon.setChecked(Settings.readShowSetupWizardIcon(prefs, getActivity()));
         updateShowCorrectionSuggestionsSummary();
         updateKeyPreviewPopupDelaySummary();
         updateCustomInputStylesSummary();