1 files changed, 22 insertions, 7 deletions
diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java
index abd1dc692..0a4aea140 100644
--- a/java/src/com/android/inputmethod/latin/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/SettingsValues.java
@@ -28,6 +28,7 @@ import com.android.inputmethod.compat.InputTypeCompatUtils;
 import com.android.inputmethod.compat.VibratorCompatWrapper;
 import com.android.inputmethod.keyboard.internal.KeySpecParser;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -174,28 +175,42 @@ public class SettingsValues {
     }
 
     private static SuggestedWords createSuggestPuncList(final String[] puncs) {
-        final SuggestedWords.Builder builder = new SuggestedWords.Builder();
+        final ArrayList<SuggestedWords.SuggestedWordInfo> puncList =
+                new ArrayList<SuggestedWords.SuggestedWordInfo>();
         if (puncs != null) {
             for (final String puncSpec : puncs) {
-                builder.addWord(KeySpecParser.getLabel(puncSpec));
+                puncList.add(new SuggestedWords.SuggestedWordInfo(
+                        KeySpecParser.getLabel(puncSpec)));
             }
         }
-        return builder.setIsPunctuationSuggestions().build();
+        final SuggestedWords.Builder builder = new SuggestedWords.Builder(puncList,
+                false /* typedWordValid */,
+                false /* hasMinimalSuggestion */,
+                false /* allowsToBeAutoCorrected */,
+                true /* isPunctuationSuggestions */);
+        return builder.build();
     }
 
     private static SuggestedWords createSuggestPuncOutputTextList(final String[] puncs) {
-        final SuggestedWords.Builder builder = new SuggestedWords.Builder();
+        final ArrayList<SuggestedWords.SuggestedWordInfo> puncOutputTextList =
+                new ArrayList<SuggestedWords.SuggestedWordInfo>();
         if (puncs != null) {
             for (final String puncSpec : puncs) {
                 final String outputText = KeySpecParser.getOutputText(puncSpec);
                 if (outputText != null) {
-                    builder.addWord(outputText);
+                    puncOutputTextList.add(new SuggestedWords.SuggestedWordInfo(outputText));
                 } else {
-                    builder.addWord(KeySpecParser.getLabel(puncSpec));
+                    puncOutputTextList.add(new SuggestedWords.SuggestedWordInfo(
+                            KeySpecParser.getLabel(puncSpec)));
                 }
             }
         }
-        return builder.setIsPunctuationSuggestions().build();
+        final SuggestedWords.Builder builder = new SuggestedWords.Builder(puncOutputTextList,
+                false /* typedWordValid */,
+                false /* hasMinimalSuggestion */,
+                false /* allowsToBeAutoCorrected */,
+                true /* isPunctuationSuggestions */);
+        return builder.build();
     }
 
     private static String createWordSeparators(final String weakSpaceStrippers,