diff options
| author |   Jean Chalard <jchalard@google.com> | 2011-12-09 11:00:51 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-12-09 11:00:51 -0800 |
| commit | 1373de1339ca47a148c75a9ea5b4994f5e4172a0 (patch) | |
| tree | 7f8eb25b61e95d0c31e7ae17b9e0c0c4b11a1e20 /java/src | |
| parent | e232bb8e001cba55a9319e93639390d076941690 (diff) | |
| parent | 12f10e1585f1e9e1875661b6dc171c8a44d7ceb7 (diff) | |
| download | latinime-1373de1339ca47a148c75a9ea5b4994f5e4172a0.tar.gz latinime-1373de1339ca47a148c75a9ea5b4994f5e4172a0.tar.xz latinime-1373de1339ca47a148c75a9ea5b4994f5e4172a0.zip | |
am 12f10e15: Read options in the declaration order
* commit '12f10e1585f1e9e1875661b6dc171c8a44d7ceb7':
Read options in the declaration order
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SettingsValues.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java index d23abfeb9..e1c2be5cd 100644 --- a/java/src/com/android/inputmethod/latin/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/SettingsValues.java @@ -112,6 +112,8 @@ public class SettingsValues { prefs.getBoolean(Settings.PREF_KEY_ENABLE_SPAN_INSERT, true); // Compute other readable settings + mKeypressVibrationDuration = getCurrentVibrationDuration(prefs, res); + mFxVolume = getCurrentKeypressSoundVolume(prefs, res); mKeyPreviewPopupDismissDelay = getKeyPreviewPopupDismissDelay(prefs, res); mAutoCorrectionThreshold = getAutoCorrectionThreshold(prefs, res); final String voiceModeMain = res.getString(R.string.voice_mode_main); @@ -120,9 +122,6 @@ public class SettingsValues { mVoiceKeyEnabled = voiceMode != null && !voiceMode.equals(voiceModeOff); mVoiceKeyOnMain = voiceMode != null && voiceMode.equals(voiceModeMain); - mFxVolume = getCurrentKeypressSoundVolume(prefs, res); - mKeypressVibrationDuration = getCurrentVibrationDuration(prefs, res); - LocaleUtils.setSystemLocale(res, savedLocale); } |