aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/LatinIME.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2013-08-20 04:07:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-20 04:07:00 -0700
commitc972b602284b02cf1a3f82f72962e69ea59659f3 (patch)
treeff3f93b2fca7d1fa77e6a5944630e708d1092ac7 /java/src/com/android/inputmethod/latin/LatinIME.java
parent197a883f56cf2e1c2a339bf3aa16aabb20725941 (diff)
parentc10d76f28c23fb068674699a63d563b3710b3cba (diff)
downloadlatinime-c972b602284b02cf1a3f82f72962e69ea59659f3.tar.gz
latinime-c972b602284b02cf1a3f82f72962e69ea59659f3.tar.xz
latinime-c972b602284b02cf1a3f82f72962e69ea59659f3.zip
am c10d76f2: Merge "[AC2] Reference a dict rather than a string in suggestion infos"
* commit 'c10d76f28c23fb068674699a63d563b3710b3cba': [AC2] Reference a dict rather than a string in suggestion infos
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 5172c0825..333295140 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -2485,7 +2485,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
ResearchLogger.latinIME_pickSuggestionManually(replacedWord, index, suggestion,
mWordComposer.isBatchMode(), suggestionInfo.mScore, suggestionInfo.mKind,
- suggestionInfo.mSourceDict);
+ suggestionInfo.mSourceDict.mDictType);
}
mConnection.endBatchEdit();
// Don't allow cancellation of manual pick
@@ -2614,7 +2614,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
if (!TextUtils.equals(s, typedWord)) {
suggestions.add(new SuggestedWordInfo(s,
SuggestionStripView.MAX_SUGGESTIONS - i,
- SuggestedWordInfo.KIND_RESUMED, Dictionary.TYPE_RESUMED,
+ SuggestedWordInfo.KIND_RESUMED, Dictionary.DICTIONARY_RESUMED,
SuggestedWordInfo.NOT_AN_INDEX /* indexOfTouchPointOfSecondWord */));
}
}