From e22e67e37a4a9b493db7c29078d9d63667413e5f Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Thu, 9 Jan 2014 19:51:15 +0900
Subject: [PATCH] [IL57] Don't require a main dict suggestion.
This is bad for recorrection (it will ignore recorrection suggestions).
But if you think about it well, if you didn't have a main dict, then you
probably will compute the same stuff anyway. It's not useful
to make this check at all.
Bug: 12297051
Change-Id: I6d6cf4d9353b7c668c5413c67701563b243e585c
---
.../inputmethod/compat/SuggestionSpanUtils.java | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java b/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java
index b8d1651dc..a32d76c30 100644
--- a/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java
+++ b/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java
@@ -74,7 +74,6 @@ public final class SuggestionSpanUtils {
return pickedWord;
}
- boolean hasSuggestionFromMainDictionary = false;
final ArrayList<String> suggestionsList = CollectionUtils.newArrayList();
for (int i = 0; i < suggestedWords.size(); ++i) {
if (suggestionsList.size() >= SuggestionSpan.SUGGESTIONS_MAX_SIZE) {
@@ -84,22 +83,11 @@ public final class SuggestionSpanUtils {
if (info.mKind == SuggestedWordInfo.KIND_PREDICTION) {
continue;
}
- if (info.mSourceDict.mDictType == Dictionary.TYPE_MAIN) {
- hasSuggestionFromMainDictionary = true;
- }
final String word = suggestedWords.getWord(i);
if (!TextUtils.equals(pickedWord, word)) {
suggestionsList.add(word.toString());
}
}
- if (!hasSuggestionFromMainDictionary) {
- // If we don't have any suggestions from the dictionary, it probably looks bad
- // enough as it is already because suggestions come pretty much only from contacts.
- // Let's not embed these bad suggestions in the text view so as to avoid using
- // them with recorrection.
- return pickedWord;
- }
-
final SuggestionSpan suggestionSpan = new SuggestionSpan(context, null /* locale */,
suggestionsList.toArray(new String[suggestionsList.size()]), 0 /* flags */,
SuggestionSpanPickedNotificationReceiver.class);