diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-06-14 14:51:37 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-06-14 14:51:37 -0700 |
| commit | cf6e923b181a38762520fe94bc3f70c5ef400e1f (patch) | |
| tree | 1abae3a4fa90fc50b944c7e6f60afa1e6f0e10b8 /java/src/com/android/inputmethod/latin/SettingsValues.java | |
| parent | 775d8dcaebbfdf8eba641c1673cfca8f57e87e29 (diff) | |
| parent | 42ecf39d04df9eb02e57cf29e63552bc04092857 (diff) | |
| download | latinime-cf6e923b181a38762520fe94bc3f70c5ef400e1f.tar.gz latinime-cf6e923b181a38762520fe94bc3f70c5ef400e1f.tar.xz latinime-cf6e923b181a38762520fe94bc3f70c5ef400e1f.zip | |
am 42ecf39d: am 002e43ea: Merge "Remove irrelevant options." into jb-dev
* commit '42ecf39d04df9eb02e57cf29e63552bc04092857':
Remove irrelevant options.
Diffstat (limited to 'java/src/com/android/inputmethod/latin/SettingsValues.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SettingsValues.java | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java index 6a79aa611..f8a0a4df6 100644 --- a/java/src/com/android/inputmethod/latin/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/SettingsValues.java @@ -151,8 +151,8 @@ public class SettingsValues { && isBigramSuggestionEnabled(prefs, res, mAutoCorrectEnabled); mBigramPredictionEnabled = mBigramSuggestionEnabled && isBigramPredictionEnabled(prefs, res); - mEnableSuggestionSpanInsertion = - prefs.getBoolean(Settings.PREF_KEY_ENABLE_SPAN_INSERT, true); + // TODO: remove mEnableSuggestionSpanInsertion. It's always true. + mEnableSuggestionSpanInsertion = true; mVibrationDurationSettingsRawValue = prefs.getInt(Settings.PREF_VIBRATION_DURATION_SETTINGS, -1); mKeypressSoundVolumeRawValue = prefs.getFloat(Settings.PREF_KEYPRESS_SOUND_VOLUME, -1.0f); @@ -288,13 +288,8 @@ public class SettingsValues { private static boolean isBigramSuggestionEnabled(final SharedPreferences sp, final Resources resources, final boolean autoCorrectEnabled) { - final boolean showBigramSuggestionsOption = resources.getBoolean( - R.bool.config_enable_next_word_suggestions_option); - if (!showBigramSuggestionsOption) { - return autoCorrectEnabled; - } - return sp.getBoolean(Settings.PREF_BIGRAM_SUGGESTION, resources.getBoolean( - R.bool.config_default_next_word_suggestions)); + // TODO: remove this method. Bigram suggestion is always true. + return true; } private static boolean isBigramPredictionEnabled(final SharedPreferences sp, |