Merge "Update the names and default values of bigram options."
diff --git a/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java b/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java
index 5c351e4..43c19d7 100644
--- a/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java
+++ b/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java
@@ -136,6 +136,8 @@
? (OBJ_FLAG_EASY_CORRECT | OBJ_FLAG_MISSPELLED)
: 0;
+ // TODO: We should avoid adding suggestion span candidates that came from the bigram
+ // prediction.
final Object[] args =
{ context, null, suggestionsList.toArray(new String[suggestionsList.size()]), flag,
(Class<?>) SuggestionSpanPickedNotificationReceiver.class };
diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index b31f301..0fcac58 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -261,7 +261,9 @@
SuggestedWordInfo.removeDups(mSuggestions);
return new SuggestedWords(mSuggestions,
- false /* typedWordValid */,
+ // TODO: Just assuming the suggestions that came from the bigram prediction are
+ // valid now. Need to assign a correct value for typedWordValid.
+ true /* typedWordValid */,
false /* hasAutoCorrectionCandidate */,
false /* allowsToBeAutoCorrected */,
false /* isPunctuationSuggestions */,