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

Merge "Straighten out the last bastion of the Builder"

Browse source
This commit is contained in:
Jean Chalard 2012-03-13 20:23:16 -07:00 committed by Android (Google) Code Review
commit 76e3861981
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -437,13 +437,20 @@ public class Suggest implements Dictionary.WordCallback {
} }
// Don't auto-correct words with multiple capital letter // Don't auto-correct words with multiple capital letter
autoCorrectionAvailable &= !wordComposer.isMostlyCaps(); autoCorrectionAvailable &= !wordComposer.isMostlyCaps();
final boolean shouldBlockAutoCorrectionBySatefyNet;
if (allowsToBeAutoCorrected && scoreInfoList.size() > 1 && mAutoCorrectionThreshold > 0
&& Suggest.shouldBlockAutoCorrectionBySafetyNet(typedWord,
scoreInfoList.get(1).mWord)) {
shouldBlockAutoCorrectionBySatefyNet = true;
} else {
shouldBlockAutoCorrectionBySatefyNet = false;
}
builder = new SuggestedWords.Builder(scoreInfoList, builder = new SuggestedWords.Builder(scoreInfoList,
!allowsToBeAutoCorrected /* typedWordValid */, !allowsToBeAutoCorrected /* typedWordValid */,
autoCorrectionAvailable /* hasMinimalSuggestion */, autoCorrectionAvailable /* hasMinimalSuggestion */,
allowsToBeAutoCorrected /* allowsToBeAutoCorrected */, allowsToBeAutoCorrected /* allowsToBeAutoCorrected */,
false /* isPunctuationSuggestions */); false /* isPunctuationSuggestions */);
if (allowsToBeAutoCorrected && builder.size() > 1 && mAutoCorrectionThreshold > 0 if (shouldBlockAutoCorrectionBySatefyNet) {
&& Suggest.shouldBlockAutoCorrectionBySafetyNet(typedWord, builder.getWord(1))) {
builder.setShouldBlockAutoCorrectionBySafetyNet(); builder.setShouldBlockAutoCorrectionBySafetyNet();
} }
return builder; return builder;

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

@ -170,7 +170,7 @@ public class SuggestedWords {
} }
public static class SuggestedWordInfo { public static class SuggestedWordInfo {
private final CharSequence mWord; public final CharSequence mWord;
private final CharSequence mDebugString; private final CharSequence mDebugString;
private final boolean mPreviousSuggestedWord; private final boolean mPreviousSuggestedWord;