aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2012-06-27 18:18:35 +0900
committerJean Chalard <jchalard@google.com>2012-06-27 18:18:35 +0900
commit3705ef407b654e818d4ec8854f08495bca4688d9 (patch)
tree0c7e531baf682d63497ddecd97754e99c39e2f40 /java/src
parent24eec0fa680f97e64d1fa0df754acbad95ed9a76 (diff)
downloadlatinime-3705ef407b654e818d4ec8854f08495bca4688d9.tar.gz
latinime-3705ef407b654e818d4ec8854f08495bca4688d9.tar.xz
latinime-3705ef407b654e818d4ec8854f08495bca4688d9.zip
Read the suggestion type from the suggestion
...instead of dirtily passing it from the dictionary loop Change-Id: I92ddbd7451609b69f6d4dc31bf89d614423b2016
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/Suggest.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 93e6d6602..389d4e215 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -221,7 +221,7 @@ public class Suggest {
localSuggestions.addAll(dictionary.getBigrams(wordComposer, lowerPrevWord));
}
for (final SuggestedWordInfo localSuggestion : localSuggestions) {
- addWord(localSuggestion, key, suggestionsContainer);
+ addWord(localSuggestion, suggestionsContainer);
}
}
}
@@ -245,7 +245,7 @@ public class Suggest {
final ArrayList<SuggestedWordInfo> localSuggestions = dictionary.getWords(
wordComposerForLookup, prevWordForBigram, proximityInfo);
for (final SuggestedWordInfo suggestion : localSuggestions) {
- addWord(suggestion, key, suggestionsContainer);
+ addWord(suggestion, suggestionsContainer);
}
}
}
@@ -370,7 +370,7 @@ public class Suggest {
private static final SuggestedWordInfoComparator sSuggestedWordInfoComparator =
new SuggestedWordInfoComparator();
- public void addWord(final SuggestedWordInfo wordInfo, final String dictTypeKey,
+ public void addWord(final SuggestedWordInfo wordInfo,
final ArrayList<SuggestedWordInfo> suggestions) {
final int index =
Collections.binarySearch(suggestions, wordInfo, sSuggestedWordInfoComparator);
@@ -385,7 +385,8 @@ public class Suggest {
if (suggestions.size() > MAX_SUGGESTIONS) {
suggestions.remove(MAX_SUGGESTIONS);
}
- LatinImeLogger.onAddSuggestedWord(transformedWordInfo.mWord.toString(), dictTypeKey);
+ LatinImeLogger.onAddSuggestedWord(transformedWordInfo.mWord.toString(),
+ transformedWordInfo.mSourceDict);
}
private static SuggestedWordInfo getTransformedSuggestedWordInfo(