am 647f629a: am a5a2f3e3: Remove gesture suggestions with an INT_MIN score

* commit '647f629a5a22f9d09c17b5667cc83e9c138edc0f':
  Remove gesture suggestions with an INT_MIN score
main
Jean Chalard 2013-04-17 19:47:16 -07:00 committed by Android Git Automerger
commit 0376d9a0d6
1 changed files with 12 additions and 0 deletions

View File

@ -47,6 +47,9 @@ public final class Suggest {
// TODO: rename this to CORRECTION_ON // TODO: rename this to CORRECTION_ON
public static final int CORRECTION_FULL = 1; public static final int CORRECTION_FULL = 1;
// Close to -2**31
private static final int SUPPRESS_SUGGEST_THRESHOLD = -2000000000;
public interface SuggestInitializationListener { public interface SuggestInitializationListener {
public void onUpdateMainDictionaryAvailability(boolean isMainDictionaryAvailable); public void onUpdateMainDictionaryAvailability(boolean isMainDictionaryAvailable);
} }
@ -340,6 +343,15 @@ public final class Suggest {
suggestionsContainer.add(1, rejected); suggestionsContainer.add(1, rejected);
} }
SuggestedWordInfo.removeDups(suggestionsContainer); SuggestedWordInfo.removeDups(suggestionsContainer);
// For some reason some suggestions with MIN_VALUE are making their way here.
// TODO: Find a more robust way to detect distractors.
for (int i = suggestionsContainer.size() - 1; i >= 0; --i) {
if (suggestionsContainer.get(i).mScore < SUPPRESS_SUGGEST_THRESHOLD) {
suggestionsContainer.remove(i);
}
}
// In the batch input mode, the most relevant suggested word should act as a "typed word" // In the batch input mode, the most relevant suggested word should act as a "typed word"
// (typedWordValid=true), not as an "auto correct word" (willAutoCorrect=false). // (typedWordValid=true), not as an "auto correct word" (willAutoCorrect=false).
return new SuggestedWords(suggestionsContainer, return new SuggestedWords(suggestionsContainer,