aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-03-13 19:38:47 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-13 19:38:47 -0700
commitfc00d2bfbe0925d5060bc1e3b06b9b337bda3ab8 (patch)
treefa2d0fdb5df364b51b7e0b7b52113b18e57f9173 /java/src
parentcb8ed32be56f2234d77e8abb0c36b647cb5d4c52 (diff)
parentf5caf5be994f8b7885f4e434e25019fd847ca927 (diff)
downloadlatinime-fc00d2bfbe0925d5060bc1e3b06b9b337bda3ab8.tar.gz
latinime-fc00d2bfbe0925d5060bc1e3b06b9b337bda3ab8.tar.xz
latinime-fc00d2bfbe0925d5060bc1e3b06b9b337bda3ab8.zip
am f5caf5be: am 601a8582: Merge "Move checking non-persistent checkbox to onResume" into jb-mr2-dev
* commit 'f5caf5be994f8b7885f4e434e25019fd847ca927': Move checking non-persistent checkbox to onResume
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/SettingsFragment.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/SettingsFragment.java b/java/src/com/android/inputmethod/latin/SettingsFragment.java
index d305285e9..cc9f168d0 100644
--- a/java/src/com/android/inputmethod/latin/SettingsFragment.java
+++ b/java/src/com/android/inputmethod/latin/SettingsFragment.java
@@ -156,10 +156,6 @@ public final class SettingsFragment extends InputMethodSettingsFragment
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 @@ public final class SettingsFragment extends InputMethodSettingsFragment
} 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();