Merge "Cleanup, part 1 (C1)"

main
Jean Chalard 2012-06-18 10:28:57 -07:00 committed by Android (Google) Code Review
commit 65b7bcb045
1 changed files with 1 additions and 8 deletions

View File

@ -157,8 +157,7 @@ public class SettingsValues {
Integer.toString(res.getInteger(R.integer.config_key_preview_linger_timeout)));
mUseContactsDict = prefs.getBoolean(Settings.PREF_KEY_USE_CONTACTS_DICT, true);
mAutoCorrectEnabled = isAutoCorrectEnabled(res, mAutoCorrectionThresholdRawValue);
mBigramSuggestionEnabled = mAutoCorrectEnabled
&& isBigramSuggestionEnabled(prefs, res, mAutoCorrectEnabled);
mBigramSuggestionEnabled = mAutoCorrectEnabled;
mBigramPredictionEnabled = mBigramSuggestionEnabled
&& isBigramPredictionEnabled(prefs, res);
// TODO: remove mEnableSuggestionSpanInsertion. It's always true.
@ -308,12 +307,6 @@ public class SettingsValues {
R.integer.config_key_preview_linger_timeout))));
}
private static boolean isBigramSuggestionEnabled(final SharedPreferences sp,
final Resources resources, final boolean autoCorrectEnabled) {
// TODO: remove this method. Bigram suggestion is always true.
return true;
}
private static boolean isBigramPredictionEnabled(final SharedPreferences sp,
final Resources resources) {
return sp.getBoolean(Settings.PREF_BIGRAM_PREDICTIONS, resources.getBoolean(