From 03a35170751a635332c00bf6c272a0127a255cf6 Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Thu, 15 Mar 2012 13:12:08 +0900
Subject: [PATCH] Add info for obsolete suggestions in SuggestedWords

Change-Id: I9684c7b08244b34853ce8a99b6e9d885389f6687
---
 java/src/com/android/inputmethod/latin/LatinIME.java       | 6 ++++--
 java/src/com/android/inputmethod/latin/SettingsValues.java | 3 ++-
 java/src/com/android/inputmethod/latin/Suggest.java        | 6 ++++--
 java/src/com/android/inputmethod/latin/SuggestedWords.java | 7 +++++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 9f5931de9..42dd766fa 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -931,7 +931,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
                     false /* typedWordValid */,
                     false /* hasAutoCorrectionCandidate */,
                     false /* allowsToBeAutoCorrected */,
-                    false /* isPunctuationSuggestions */);
+                    false /* isPunctuationSuggestions */,
+                    false /* isObsoleteSuggestions */);
             // When in fullscreen mode, show completions generated by the application
             final boolean isAutoCorrection = false;
             setSuggestions(suggestedWords, isAutoCorrection);
@@ -1793,7 +1794,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
                             false /* typedWordValid */,
                             false /* hasAutoCorrectionCandidate */,
                             false /* allowsToBeAutoCorrected */,
-                            false /* isPunctuationSuggestions */);
+                            false /* isPunctuationSuggestions */,
+                            true /* isObsoleteSuggestions */);
             showSuggestions(obsoleteSuggestedWords, typedWord);
         }
     }
diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java
index be9c5cf4c..4346a3671 100644
--- a/java/src/com/android/inputmethod/latin/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/SettingsValues.java
@@ -173,7 +173,8 @@ public class SettingsValues {
                 false /* typedWordValid */,
                 false /* hasAutoCorrectionCandidate */,
                 false /* allowsToBeAutoCorrected */,
-                true /* isPunctuationSuggestions */);
+                true /* isPunctuationSuggestions */,
+                false /* isObsoleteSuggestions */);
     }
 
     private static String createWordSeparators(final String weakSpaceStrippers,
diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index c0ec4f614..79a819d1e 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -274,7 +274,8 @@ public class Suggest implements Dictionary.WordCallback {
                 false /* typedWordValid */,
                 false /* hasAutoCorrectionCandidate */,
                 false /* allowsToBeAutoCorrected */,
-                false /* isPunctuationSuggestions */);
+                false /* isPunctuationSuggestions */,
+                false /* isObsoleteSuggestions */);
     }
 
     // TODO: cleanup dictionaries looking up and suggestions building with SuggestedWords.Builder
@@ -413,7 +414,8 @@ public class Suggest implements Dictionary.WordCallback {
                 !allowsToBeAutoCorrected /* typedWordValid */,
                 autoCorrectionAvailable /* hasAutoCorrectionCandidate */,
                 allowsToBeAutoCorrected /* allowsToBeAutoCorrected */,
-                false /* isPunctuationSuggestions */);
+                false /* isPunctuationSuggestions */,
+                false /* isObsoleteSuggestions */);
     }
 
     // This assumes the scores[] array is at least as long as suggestions.size() - 1.
diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java
index 6b231f81c..3c5e65f16 100644
--- a/java/src/com/android/inputmethod/latin/SuggestedWords.java
+++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java
@@ -27,24 +27,27 @@ import java.util.List;
 
 public class SuggestedWords {
     public static final SuggestedWords EMPTY = new SuggestedWords(
-            Collections.<SuggestedWordInfo>emptyList(), false, false, false, false);
+            Collections.<SuggestedWordInfo>emptyList(), false, false, false, false, false);
 
     public final boolean mTypedWordValid;
     public final boolean mHasAutoCorrectionCandidate;
     public final boolean mIsPunctuationSuggestions;
     public final boolean mAllowsToBeAutoCorrected;
+    public final boolean mIsObsoleteSuggestions;
     private final List<SuggestedWordInfo> mSuggestedWordInfoList;
 
     public SuggestedWords(final List<SuggestedWordInfo> suggestedWordInfoList,
             final boolean typedWordValid,
             final boolean hasAutoCorrectionCandidate,
             final boolean allowsToBeAutoCorrected,
-            final boolean isPunctuationSuggestions) {
+            final boolean isPunctuationSuggestions,
+            final boolean isObsoleteSuggestions) {
         mSuggestedWordInfoList = suggestedWordInfoList;
         mTypedWordValid = typedWordValid;
         mHasAutoCorrectionCandidate = hasAutoCorrectionCandidate;
         mAllowsToBeAutoCorrected = allowsToBeAutoCorrected;
         mIsPunctuationSuggestions = isPunctuationSuggestions;
+        mIsObsoleteSuggestions = isObsoleteSuggestions;
     }
 
     public int size() {