From 12f10e1585f1e9e1875661b6dc171c8a44d7ceb7 Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Fri, 9 Dec 2011 18:58:24 +0900 Subject: [PATCH] Read options in the declaration order Change-Id: I1a7c4d0bcaedad6d4045c36c79280c23234db5b3 --- java/src/com/android/inputmethod/latin/SettingsValues.java | 5 ++--- 1 file 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); }