Do not put the suggestion span for obsolete suggestions.

Bug: 5219037

Change-Id: I0300fbc7e1cc97f0f8ba4d21e0e699d9fe66ed76

3 files changed, 4 insertions, 3 deletions

diff --git a/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java b/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java
index 4929dd948..5c54fa548 100644
--- a/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java
+++ b/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java
@@ -53,7 +53,8 @@ public class SuggestionSpanUtils {
     public static CharSequence getTextWithSuggestionSpan(Context context,
             CharSequence pickedWord, SuggestedWords suggestedWords) {
         if (TextUtils.isEmpty(pickedWord) || CONSTRUCTOR_SuggestionSpan == null
-                || suggestedWords == null || suggestedWords.size() == 0) {
+                || suggestedWords == null || suggestedWords.size() == 0
+                || suggestedWords.getInfo(0).isObsoleteSuggestedWord()) {
             return pickedWord;
         }
 
diff --git a/java/src/com/android/inputmethod/latin/CandidateView.java b/java/src/com/android/inputmethod/latin/CandidateView.java
index 85870f38e..bc626072a 100644
--- a/java/src/com/android/inputmethod/latin/CandidateView.java
+++ b/java/src/com/android/inputmethod/latin/CandidateView.java
@@ -366,7 +366,7 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
 
             final SuggestedWordInfo info = (pos < suggestions.size())
                     ? suggestions.getInfo(pos) : null;
-            if (info != null && info.isPreviousSuggestedWord()) {
+            if (info != null && info.isObsoleteSuggestedWord()) {
                 return applyAlpha(color, 0.5f);
             } else {
                 return color;
diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java
index c1c46fa47..b177d144a 100644
--- a/java/src/com/android/inputmethod/latin/SuggestedWords.java
+++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java
@@ -199,7 +199,7 @@ public class SuggestedWords {
             }
         }
 
-        public boolean isPreviousSuggestedWord () {
+        public boolean isObsoleteSuggestedWord () {
             return mPreviousSuggestedWord;
         }
     }