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
This commit is contained in:
Tadashi G. Takaoka 2013-03-13 19:38:47 -07:00 committed by Android Git Automerger
commit fc00d2bfbe

View file

@ -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();