am cb622125: DO NOT MERGE. Remove a preference for bigram suggestion
Merge commit 'cb6221257a2f4025c91de4d65f5591e6563c54ce' into gingerbread-plus-aosp * commit 'cb6221257a2f4025c91de4d65f5591e6563c54ce': DO NOT MERGE. Remove a preference for bigram suggestionmain
commit
65333e712b
|
@ -105,15 +105,6 @@
|
|||
android:defaultValue="@bool/enable_autocorrect"
|
||||
android:dependency="show_suggestions"
|
||||
/>
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="bigram_suggestion"
|
||||
android:title="@string/bigram_suggestion"
|
||||
android:summary="@string/bigram_suggestion_summary"
|
||||
android:persistent="true"
|
||||
android:defaultValue="true"
|
||||
android:dependency="auto_complete"
|
||||
/>
|
||||
</PreferenceCategory>
|
||||
|
||||
<CheckBoxPreference
|
||||
|
|
|
@ -94,7 +94,7 @@ public class LatinIME extends InputMethodService
|
|||
private static final String PREF_QUICK_FIXES = "quick_fixes";
|
||||
private static final String PREF_SHOW_SUGGESTIONS = "show_suggestions";
|
||||
private static final String PREF_AUTO_COMPLETE = "auto_complete";
|
||||
private static final String PREF_BIGRAM_SUGGESTIONS = "bigram_suggestion";
|
||||
//private static final String PREF_BIGRAM_SUGGESTIONS = "bigram_suggestion";
|
||||
private static final String PREF_VOICE_MODE = "voice_mode";
|
||||
|
||||
// Whether or not the user has used voice input before (and thus, whether to show the
|
||||
|
@ -193,7 +193,8 @@ public class LatinIME extends InputMethodService
|
|||
private boolean mAutoSpace;
|
||||
private boolean mJustAddedAutoSpace;
|
||||
private boolean mAutoCorrectEnabled;
|
||||
private boolean mBigramSuggestionEnabled;
|
||||
// Bigram Suggestion is disabled in this version.
|
||||
private final boolean mBigramSuggestionEnabled = false;
|
||||
private boolean mAutoCorrectOn;
|
||||
// TODO move this state variable outside LatinIME
|
||||
private boolean mCapsLock;
|
||||
|
@ -2356,7 +2357,8 @@ public class LatinIME extends InputMethodService
|
|||
}
|
||||
mAutoCorrectEnabled = sp.getBoolean(PREF_AUTO_COMPLETE,
|
||||
mResources.getBoolean(R.bool.enable_autocorrect)) & mShowSuggestions;
|
||||
mBigramSuggestionEnabled = sp.getBoolean(PREF_BIGRAM_SUGGESTIONS, true) & mShowSuggestions;
|
||||
//mBigramSuggestionEnabled = sp.getBoolean(
|
||||
// PREF_BIGRAM_SUGGESTIONS, true) & mShowSuggestions;
|
||||
updateCorrectionMode();
|
||||
updateAutoTextEnabled(mResources.getConfiguration().locale);
|
||||
mLanguageSwitcher.loadLocales(sp);
|
||||
|
|
Loading…
Reference in New Issue