diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2014-05-28 11:52:00 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-05-28 11:52:00 +0000 |
| commit | b1e43d58a6910903aceea51a0615b2fa5570a36b (patch) | |
| tree | c7756685caef581e5c8f8ccac2e8d21dc2298775 /java/src/com/android/inputmethod/latin/utils | |
| parent | 7852765a503fe6dab54e1c4ab9e5e6b7bbdc70f2 (diff) | |
| parent | 4bffac6db9e5800ecc58ba12d86b98a184779eba (diff) | |
| download | latinime-b1e43d58a6910903aceea51a0615b2fa5570a36b.tar.gz latinime-b1e43d58a6910903aceea51a0615b2fa5570a36b.tar.xz latinime-b1e43d58a6910903aceea51a0615b2fa5570a36b.zip | |
Merge "Stop directly checking SuggestedWordInfo.mKind"
Diffstat (limited to 'java/src/com/android/inputmethod/latin/utils')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/utils/AutoCorrectionUtils.java | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/utils/DistracterFilterUsingSuggestion.java | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/latin/utils/AutoCorrectionUtils.java b/java/src/com/android/inputmethod/latin/utils/AutoCorrectionUtils.java index 857d0b0da..34ee2152a 100644 --- a/java/src/com/android/inputmethod/latin/utils/AutoCorrectionUtils.java +++ b/java/src/com/android/inputmethod/latin/utils/AutoCorrectionUtils.java @@ -35,7 +35,9 @@ public final class AutoCorrectionUtils { final float autoCorrectionThreshold) { if (null != suggestion) { // Shortlist a whitelisted word - if (suggestion.mKind == SuggestedWordInfo.KIND_WHITELIST) return true; + if (suggestion.isKindOf(SuggestedWordInfo.KIND_WHITELIST)) { + return true; + } final int autoCorrectionSuggestionScore = suggestion.mScore; // TODO: when the normalized score of the first suggestion is nearly equals to // the normalized score of the second suggestion, behave less aggressive. diff --git a/java/src/com/android/inputmethod/latin/utils/DistracterFilterUsingSuggestion.java b/java/src/com/android/inputmethod/latin/utils/DistracterFilterUsingSuggestion.java index ac0ab28bf..b9c7f5671 100644 --- a/java/src/com/android/inputmethod/latin/utils/DistracterFilterUsingSuggestion.java +++ b/java/src/com/android/inputmethod/latin/utils/DistracterFilterUsingSuggestion.java @@ -108,10 +108,9 @@ public class DistracterFilterUsingSuggestion implements DistracterFilter { continue; } // Exact match can include case errors, accent errors, digraph conversions. - final boolean isExactMatch = - (suggestedWordInfo.mKind & SuggestedWordInfo.KIND_FLAG_EXACT_MATCH) != 0; - final boolean isExactMatchWithIntentionalOmission = (suggestedWordInfo.mKind - & SuggestedWordInfo.KIND_FLAG_EXACT_MATCH_WITH_INTENTIONAL_OMISSION) != 0; + final boolean isExactMatch = suggestedWordInfo.isExactMatch(); + final boolean isExactMatchWithIntentionalOmission = + suggestedWordInfo.isExactMatchWithIntentionalOmission(); if (DEBUG) { final float normalizedScore = BinaryDictionaryUtils.calcNormalizedScore( |