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

am 12f10e15: Read options in the declaration order 

* commit '12f10e1585f1e9e1875661b6dc171c8a44d7ceb7':
  Read options in the declaration order
main
Jean Chalard 2011-12-09 11:00:51 -08:00 committed by Android Git Automerger
parent e232bb8e00 12f10e1585
commit 1373de1339
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/src/com/android/inputmethod/latin/SettingsValues.java
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);
} }