Read the suggestion type from the suggestion
...instead of dirtily passing it from the dictionary loop
Change-Id: I92ddbd7451609b69f6d4dc31bf89d614423b2016
diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 93e6d66..389d4e2 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -221,7 +221,7 @@
localSuggestions.addAll(dictionary.getBigrams(wordComposer, lowerPrevWord));
}
for (final SuggestedWordInfo localSuggestion : localSuggestions) {
- addWord(localSuggestion, key, suggestionsContainer);
+ addWord(localSuggestion, suggestionsContainer);
}
}
}
@@ -245,7 +245,7 @@
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 @@
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 @@
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(