From ba93dda8cea74c903a01374b9e54a0fd467a4cf1 Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Fri, 9 Dec 2011 17:58:51 +0900 Subject: Match constant names to option names Change-Id: I7586fa342d7a39412d656890f7b525139c45ea4a --- java/src/com/android/inputmethod/latin/SettingsValues.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'java/src/com/android/inputmethod/latin/SettingsValues.java') diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java index 9c956d2a3..adb6b3a1c 100644 --- a/java/src/com/android/inputmethod/latin/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/SettingsValues.java @@ -127,7 +127,7 @@ public class SettingsValues { : defaultShowSettingsKey; final String voiceModeMain = res.getString(R.string.voice_mode_main); final String voiceModeOff = res.getString(R.string.voice_mode_off); - final String voiceMode = prefs.getString(Settings.PREF_VOICE_SETTINGS_KEY, voiceModeMain); + final String voiceMode = prefs.getString(Settings.PREF_VOICE_MODE, voiceModeMain); mVoiceKeyEnabled = voiceMode != null && !voiceMode.equals(voiceModeOff); mVoiceKeyOnMain = voiceMode != null && voiceMode.equals(voiceModeMain); @@ -172,7 +172,7 @@ public class SettingsValues { final boolean showPopupOption = resources.getBoolean( R.bool.config_enable_show_popup_on_keypress_option); if (!showPopupOption) return resources.getBoolean(R.bool.config_default_popup_preview); - return sp.getBoolean(Settings.PREF_KEY_PREVIEW_POPUP_ON, + return sp.getBoolean(Settings.PREF_POPUP_ON, resources.getBoolean(R.bool.config_default_popup_preview)); } @@ -190,7 +190,7 @@ public class SettingsValues { if (!showBigramSuggestionsOption) { return autoCorrectEnabled; } - return sp.getBoolean(Settings.PREF_BIGRAM_SUGGESTIONS, resources.getBoolean( + return sp.getBoolean(Settings.PREF_BIGRAM_SUGGESTION, resources.getBoolean( R.bool.config_default_bigram_suggestions)); } @@ -277,7 +277,7 @@ public class SettingsValues { // Likewise public static int getCurrentVibrationDuration(final SharedPreferences sp, final Resources res) { - final int ms = sp.getInt(Settings.PREF_KEYPRESS_VIBRATION_DURATION_SETTINGS, -1); + final int ms = sp.getInt(Settings.PREF_VIBRATION_DURATION_SETTINGS, -1); if (ms >= 0) { return ms; } -- cgit v1.2.3-83-g751a