aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/Suggest.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-06-24 06:18:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-24 06:18:06 +0000
commita12fc2637b7911f3c0747bdce1c2f995a0e77547 (patch)
tree4522df248cad19b3e0a6f56e883bf28a08057a4f /java/src/com/android/inputmethod/latin/Suggest.java
parent9b12d7982a5722608463c3e8eb1c34a0b06db43a (diff)
parenta1d518ca88e145c5522e625c97987ed71221dada (diff)
downloadlatinime-a12fc2637b7911f3c0747bdce1c2f995a0e77547.tar.gz
latinime-a12fc2637b7911f3c0747bdce1c2f995a0e77547.tar.xz
latinime-a12fc2637b7911f3c0747bdce1c2f995a0e77547.zip
am a1d518ca: Merge "[CS2] Refactor a bit removeDups"
* commit 'a1d518ca88e145c5522e625c97987ed71221dada': [CS2] Refactor a bit removeDups
Diffstat (limited to 'java/src/com/android/inputmethod/latin/Suggest.java')
-rw-r--r--java/src/com/android/inputmethod/latin/Suggest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 7364fc979..575ec5c76 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -180,6 +180,7 @@ public final class Suggest {
suggestionsContainer.set(i, transformedWordInfo);
}
}
+ SuggestedWordInfo.removeDups(typedWord, suggestionsContainer);
if (!TextUtils.isEmpty(typedWord)) {
suggestionsContainer.add(0, new SuggestedWordInfo(typedWord,
@@ -188,7 +189,6 @@ public final class Suggest {
SuggestedWordInfo.NOT_AN_INDEX /* indexOfTouchPointOfSecondWord */,
SuggestedWordInfo.NOT_A_CONFIDENCE /* autoCommitFirstWordConfidence */));
}
- SuggestedWordInfo.removeDups(suggestionsContainer);
final ArrayList<SuggestedWordInfo> suggestionsList;
if (DBG && !suggestionsContainer.isEmpty()) {
@@ -237,7 +237,7 @@ public final class Suggest {
final SuggestedWordInfo rejected = suggestionsContainer.remove(0);
suggestionsContainer.add(1, rejected);
}
- SuggestedWordInfo.removeDups(suggestionsContainer);
+ SuggestedWordInfo.removeDups(null /* typedWord */, suggestionsContainer);
// For some reason some suggestions with MIN_VALUE are making their way here.
// TODO: Find a more robust way to detect distractors.