Optimization (A26)

Change-Id: I1d7790289635729645995fb8c38868259ab1b3be
This commit is contained in:
Jean Chalard 2012-06-28 18:28:10 +09:00
parent 7a94cbd2a4
commit 9e0af57736

View file

@ -238,7 +238,8 @@ public class Suggest {
hasAutoCorrection = false; hasAutoCorrection = false;
} else if (AutoCorrection.suggestionExceedsAutoCorrectionThreshold(suggestionsSet.first(), } else if (AutoCorrection.suggestionExceedsAutoCorrectionThreshold(suggestionsSet.first(),
consideredWord, mAutoCorrectionThreshold)) { consideredWord, mAutoCorrectionThreshold)) {
hasAutoCorrection = true; hasAutoCorrection = !shouldBlockAutoCorrectionBySafetyNet(typedWord,
suggestionsSet.first().mWord);
} else { } else {
hasAutoCorrection = false; hasAutoCorrection = false;
} }
@ -299,14 +300,6 @@ public class Suggest {
// Don't auto-correct words with multiple capital letter // Don't auto-correct words with multiple capital letter
autoCorrectionAvailable &= !wordComposer.isMostlyCaps(); autoCorrectionAvailable &= !wordComposer.isMostlyCaps();
autoCorrectionAvailable &= !wordComposer.isResumed(); autoCorrectionAvailable &= !wordComposer.isResumed();
// TODO: this safety net check should be done right after we decide that the suggestion
// exceeds the auto-correction threshold. However as long as the |= !allowsToBeAutoCorrected
// line is there it can't be done safely in a logical manner.
if (allowsToBeAutoCorrected && suggestionsList.size() > 1 && mAutoCorrectionThreshold > 0
&& Suggest.shouldBlockAutoCorrectionBySafetyNet(typedWord,
suggestionsList.get(1).mWord)) {
autoCorrectionAvailable = false;
}
return new SuggestedWords(suggestionsList, return new SuggestedWords(suggestionsList,
// TODO: this first argument is lying. If this is a whitelisted word which is an // TODO: this first argument is lying. If this is a whitelisted word which is an
// actual word, it says typedWordValid = false, which looks wrong. We should either // actual word, it says typedWordValid = false, which looks wrong. We should either