nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 suggestion
main
satok 2010-08-29 23:30:51 -07:00 committed by Android Git Automerger
parent fd2ccb7dd4 cb6221257a
commit 65333e712b
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/res/xml/prefs.xml
View File

@ -105,15 +105,6 @@
android:defaultValue="@bool/enable_autocorrect" android:defaultValue="@bool/enable_autocorrect"
android:dependency="show_suggestions" 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> </PreferenceCategory>
<CheckBoxPreference <CheckBoxPreference

8
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -94,7 +94,7 @@ public class LatinIME extends InputMethodService
private static final String PREF_QUICK_FIXES = "quick_fixes"; private static final String PREF_QUICK_FIXES = "quick_fixes";
private static final String PREF_SHOW_SUGGESTIONS = "show_suggestions"; private static final String PREF_SHOW_SUGGESTIONS = "show_suggestions";
private static final String PREF_AUTO_COMPLETE = "auto_complete"; 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"; 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 // 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 mAutoSpace;
private boolean mJustAddedAutoSpace; private boolean mJustAddedAutoSpace;
private boolean mAutoCorrectEnabled; private boolean mAutoCorrectEnabled;
private boolean mBigramSuggestionEnabled; // Bigram Suggestion is disabled in this version.
private final boolean mBigramSuggestionEnabled = false;
private boolean mAutoCorrectOn; private boolean mAutoCorrectOn;
// TODO move this state variable outside LatinIME // TODO move this state variable outside LatinIME
private boolean mCapsLock; private boolean mCapsLock;
@ -2356,7 +2357,8 @@ public class LatinIME extends InputMethodService
} }
mAutoCorrectEnabled = sp.getBoolean(PREF_AUTO_COMPLETE, mAutoCorrectEnabled = sp.getBoolean(PREF_AUTO_COMPLETE,
mResources.getBoolean(R.bool.enable_autocorrect)) & mShowSuggestions; mResources.getBoolean(R.bool.enable_autocorrect)) & mShowSuggestions;
mBigramSuggestionEnabled = sp.getBoolean(PREF_BIGRAM_SUGGESTIONS, true) & mShowSuggestions; //mBigramSuggestionEnabled = sp.getBoolean(
// PREF_BIGRAM_SUGGESTIONS, true) & mShowSuggestions;
updateCorrectionMode(); updateCorrectionMode();
updateAutoTextEnabled(mResources.getConfiguration().locale); updateAutoTextEnabled(mResources.getConfiguration().locale);
mLanguageSwitcher.loadLocales(sp); mLanguageSwitcher.loadLocales(sp);