Merge "Remove useless stuff (A1)"

main
Jean Chalard 2012-03-08 04:02:46 -08:00 committed by Android (Google) Code Review
commit 39286f98bc
1 changed files with 2 additions and 6 deletions

View File

@ -37,10 +37,6 @@ public class AutoCorrection {
return null != mAutoCorrectionWord; return null != mAutoCorrectionWord;
} }
public CharSequence getAutoCorrectionWord() {
return mAutoCorrectionWord;
}
public double getNormalizedScore() { public double getNormalizedScore() {
return mNormalizedScore; return mNormalizedScore;
} }
@ -106,8 +102,8 @@ public class AutoCorrection {
WordComposer wordComposer, ArrayList<CharSequence> suggestions, CharSequence typedWord, WordComposer wordComposer, ArrayList<CharSequence> suggestions, CharSequence typedWord,
int correctionMode) { int correctionMode) {
if (TextUtils.isEmpty(typedWord)) return false; if (TextUtils.isEmpty(typedWord)) return false;
boolean allowsAutoCorrect = allowsToBeAutoCorrected(dictionaries, typedWord, false); return wordComposer.size() > 1 && suggestions.size() > 0
return wordComposer.size() > 1 && suggestions.size() > 0 && !allowsAutoCorrect && !allowsToBeAutoCorrected(dictionaries, typedWord, false)
&& (correctionMode == Suggest.CORRECTION_FULL && (correctionMode == Suggest.CORRECTION_FULL
|| correctionMode == Suggest.CORRECTION_FULL_BIGRAM); || correctionMode == Suggest.CORRECTION_FULL_BIGRAM);
} }