Read options in the declaration order

Change-Id: I1a7c4d0bcaedad6d4045c36c79280c23234db5b3
This commit is contained in:
Jean Chalard 2011-12-09 18:58:24 +09:00
parent c40b807ca4
commit 12f10e1585

View file

@ -112,6 +112,8 @@ public class SettingsValues {
prefs.getBoolean(Settings.PREF_KEY_ENABLE_SPAN_INSERT, true); prefs.getBoolean(Settings.PREF_KEY_ENABLE_SPAN_INSERT, true);
// Compute other readable settings // Compute other readable settings
mKeypressVibrationDuration = getCurrentVibrationDuration(prefs, res);
mFxVolume = getCurrentKeypressSoundVolume(prefs, res);
mKeyPreviewPopupDismissDelay = getKeyPreviewPopupDismissDelay(prefs, res); mKeyPreviewPopupDismissDelay = getKeyPreviewPopupDismissDelay(prefs, res);
mAutoCorrectionThreshold = getAutoCorrectionThreshold(prefs, res); mAutoCorrectionThreshold = getAutoCorrectionThreshold(prefs, res);
final String voiceModeMain = res.getString(R.string.voice_mode_main); final String voiceModeMain = res.getString(R.string.voice_mode_main);
@ -120,9 +122,6 @@ public class SettingsValues {
mVoiceKeyEnabled = voiceMode != null && !voiceMode.equals(voiceModeOff); mVoiceKeyEnabled = voiceMode != null && !voiceMode.equals(voiceModeOff);
mVoiceKeyOnMain = voiceMode != null && voiceMode.equals(voiceModeMain); mVoiceKeyOnMain = voiceMode != null && voiceMode.equals(voiceModeMain);
mFxVolume = getCurrentKeypressSoundVolume(prefs, res);
mKeypressVibrationDuration = getCurrentVibrationDuration(prefs, res);
LocaleUtils.setSystemLocale(res, savedLocale); LocaleUtils.setSystemLocale(res, savedLocale);
} }