am 0675d374: am 86f77114: Merge "Don\'t auto-correct to non-whitelist shortcuts"
* commit '0675d37487f8f2ec92b0984b3ff28a5cd1d7a07e': Don't auto-correct to non-whitelist shortcutsmain
commit
ea3a2f28ab
|
@ -286,14 +286,16 @@ public final class Suggest {
|
|||
// the word *would* have been auto-corrected.
|
||||
if (!isCorrectionEnabled || !allowsToBeAutoCorrected || !wordComposer.isComposingWord()
|
||||
|| suggestionsSet.isEmpty() || wordComposer.hasDigits()
|
||||
|| wordComposer.isMostlyCaps() || wordComposer.isResumed()
|
||||
|| !hasMainDictionary()) {
|
||||
|| wordComposer.isMostlyCaps() || wordComposer.isResumed() || !hasMainDictionary()
|
||||
|| SuggestedWordInfo.KIND_SHORTCUT == suggestionsSet.first().mKind) {
|
||||
// If we don't have a main dictionary, we never want to auto-correct. The reason for
|
||||
// this is, the user may have a contact whose name happens to match a valid word in
|
||||
// their language, and it will unexpectedly auto-correct. For example, if the user
|
||||
// types in English with no dictionary and has a "Will" in their contact list, "will"
|
||||
// would always auto-correct to "Will" which is unwanted. Hence, no main dict => no
|
||||
// auto-correct.
|
||||
// Also, shortcuts should never auto-correct unless they are whitelist entries.
|
||||
// TODO: we may want to have shortcut-only entries auto-correct in the future.
|
||||
hasAutoCorrection = false;
|
||||
} else {
|
||||
hasAutoCorrection = AutoCorrectionUtils.suggestionExceedsAutoCorrectionThreshold(
|
||||
|
|
|
@ -44,7 +44,7 @@ class ShortcutUtils {
|
|||
shortcutScore = finalScore;
|
||||
// Protection against int underflow
|
||||
shortcutScore = max(S_INT_MIN + 1, shortcutScore) - 1;
|
||||
kind = Dictionary::KIND_CORRECTION;
|
||||
kind = Dictionary::KIND_SHORTCUT;
|
||||
}
|
||||
outputTypes[outputWordIndex] = kind;
|
||||
frequencies[outputWordIndex] = shortcutScore;
|
||||
|
|
Loading…
Reference in New Issue