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

Merge "Cleanup, part 4 (C4)"

Browse source
This commit is contained in:
Jean Chalard 2012-06-19 09:24:25 -07:00 committed by Android (Google) Code Review
commit c03bd090ea
3 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -1712,7 +1712,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// getSuggestedWords handles gracefully a null value of prevWord
final SuggestedWords suggestedWords = mSuggest.getSuggestedWords(mWordComposer,
prevWord, mKeyboardSwitcher.getKeyboard().getProximityInfo(),
mCurrentSettings.mCorrectionMode);
mCurrentSettings.isCorrectionOn());
// Basically, we update the suggestion strip only when suggestion count > 1. However,
// there is an exception: We update the suggestion strip whenever typed word's length

8
java/src/com/android/inputmethod/latin/SettingsValues.java
View file

@ -207,9 +207,11 @@ public class SettingsValues {
}
private int createCorrectionMode() {
final boolean shouldAutoCorrect = mAutoCorrectEnabled
&& !mInputAttributes.mInputTypeNoAutoCorrect;
return shouldAutoCorrect ? Suggest.CORRECTION_FULL : Suggest.CORRECTION_NONE;
if (mAutoCorrectEnabled && !mInputAttributes.mInputTypeNoAutoCorrect) {
return Suggest.CORRECTION_FULL;
} else {
return Suggest.CORRECTION_NONE;
}
}
private int createSuggestionVisibility(final Resources res) {

16
java/src/com/android/inputmethod/latin/Suggest.java
View file

@ -249,10 +249,18 @@ public class Suggest implements Dictionary.WordCallback {
true /* isPrediction */);
}
// TODO: cleanup dictionaries looking up and suggestions building with SuggestedWords.Builder
// Wrapper for test compatibility. TODO: remove this method
public SuggestedWords getSuggestedWords(
final WordComposer wordComposer, CharSequence prevWordForBigram,
final ProximityInfo proximityInfo, final int correctionMode) {
return getSuggestedWords(wordComposer, prevWordForBigram, proximityInfo,
Suggest.CORRECTION_FULL == correctionMode);
}
// TODO: cleanup dictionaries looking up and suggestions building with SuggestedWords.Builder
public SuggestedWords getSuggestedWords(
final WordComposer wordComposer, CharSequence prevWordForBigram,
final ProximityInfo proximityInfo, final boolean isCorrectionEnabled) {
LatinImeLogger.onStartSuggestion(prevWordForBigram);
mIsFirstCharCapitalized = wordComposer.isFirstCharCapitalized();
mIsAllUpperCase = wordComposer.isAllUpperCase();
@ -267,7 +275,7 @@ public class Suggest implements Dictionary.WordCallback {
LatinImeLogger.onAddSuggestedWord(typedWord, Suggest.DIC_USER_TYPED, Dictionary.UNIGRAM);
mConsideredWord = consideredWord;
if (wordComposer.size() <= 1 && (correctionMode == CORRECTION_FULL)) {
if (wordComposer.size() <= 1 && isCorrectionEnabled) {
// At first character typed, search only the bigrams
mBigramSuggestions = new ArrayList<SuggestedWordInfo>(PREF_MAX_BIGRAMS);
@ -324,7 +332,7 @@ public class Suggest implements Dictionary.WordCallback {
mIsFirstCharCapitalized, mWhiteListDictionary.getWhitelistedWord(consideredWord));
final boolean hasAutoCorrection;
if (CORRECTION_FULL == correctionMode) {
if (isCorrectionEnabled) {
final CharSequence autoCorrection =
AutoCorrection.computeAutoCorrectionWord(mUnigramDictionaries, wordComposer,
mSuggestions, consideredWord, mAutoCorrectionThreshold,
@ -374,7 +382,7 @@ public class Suggest implements Dictionary.WordCallback {
&& hasMainDictionary();
boolean autoCorrectionAvailable = hasAutoCorrection;
if (correctionMode == CORRECTION_FULL) {
if (isCorrectionEnabled) {
autoCorrectionAvailable |= !allowsToBeAutoCorrected;
}
// Don't auto-correct words with multiple capital letter