diff options
author | 2014-05-28 11:54:41 +0000 | |
---|---|---|
committer | 2014-05-28 11:54:41 +0000 | |
commit | 5b8887add4ffe9e9b29148d2deec8d085275cd02 (patch) | |
tree | c7756685caef581e5c8f8ccac2e8d21dc2298775 /java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java | |
parent | eeea786fb39efee7577c23337ff9c15c01ab1b64 (diff) | |
parent | b1e43d58a6910903aceea51a0615b2fa5570a36b (diff) | |
download | latinime-5b8887add4ffe9e9b29148d2deec8d085275cd02.tar.gz latinime-5b8887add4ffe9e9b29148d2deec8d085275cd02.tar.xz latinime-5b8887add4ffe9e9b29148d2deec8d085275cd02.zip |
am b1e43d58: Merge "Stop directly checking SuggestedWordInfo.mKind"
* commit 'b1e43d58a6910903aceea51a0615b2fa5570a36b':
Stop directly checking SuggestedWordInfo.mKind
Diffstat (limited to 'java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java')
-rw-r--r-- | java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java index 2318dae2d..2b7024ad6 100644 --- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java +++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java @@ -289,7 +289,7 @@ public final class InputLogic { if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) { ResearchLogger.latinIME_pickSuggestionManually(replacedWord, index, suggestion, mWordComposer.isBatchMode(), suggestionInfo.mScore, - suggestionInfo.mKind, suggestionInfo.mSourceDict.mDictType); + suggestionInfo.mKindAndFlags, suggestionInfo.mSourceDict.mDictType); } mConnection.endBatchEdit(); // Don't allow cancellation of manual pick @@ -301,8 +301,8 @@ public final class InputLogic { // We should show the "Touch again to save" hint if the user pressed the first entry // AND it's in none of our current dictionaries (main, user or otherwise). final boolean showingAddToDictionaryHint = - (SuggestedWordInfo.KIND_TYPED == suggestionInfo.mKind - || SuggestedWordInfo.KIND_OOV_CORRECTION == suggestionInfo.mKind) + (suggestionInfo.isKindOf(SuggestedWordInfo.KIND_TYPED) + || suggestionInfo.isKindOf(SuggestedWordInfo.KIND_OOV_CORRECTION)) && !mDictionaryFacilitator.isValidWord(suggestion, true /* ignoreCase */); if (settingsValues.mIsInternal) { |