nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

am 601a8582: Merge "Move checking non-persistent checkbox to onResume" into jb-mr2-dev

Browse source 
* commit '601a8582d0f761a85b6eb16e7a6b78402f6f2599':
  Move checking non-persistent checkbox to onResume
This commit is contained in:
Tadashi G. Takaoka 2013-03-14 02:33:28 +00:00 committed by Android Git Automerger
commit f5caf5be99
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
java/src/com/android/inputmethod/latin/SettingsFragment.java
View file

@ -156,10 +156,6 @@ public final class SettingsFragment extends InputMethodSettingsFragment
removePreference(Settings.PREF_GESTURE_SETTINGS, getPreferenceScreen()); 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); setupKeyLongpressTimeoutSettings(prefs, res);
setupKeypressVibrationDurationSettings(prefs, res); setupKeypressVibrationDurationSettings(prefs, res);
setupKeypressSoundVolumeSettings(prefs, res); setupKeypressSoundVolumeSettings(prefs, res);
@ -175,6 +171,10 @@ public final class SettingsFragment extends InputMethodSettingsFragment
} else { } else {
getPreferenceScreen().removePreference(mVoicePreference); 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(); updateShowCorrectionSuggestionsSummary();
updateKeyPreviewPopupDelaySummary(); updateKeyPreviewPopupDelaySummary();
updateCustomInputStylesSummary(); updateCustomInputStylesSummary();