From 1dfef0336d5968dbd00b73489778cee1fb233d56 Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Mon, 12 Mar 2012 15:00:36 +0900 Subject: [PATCH] Make a method static Change-Id: Ie1d460562d38105abe91ae2da17cafd49e2cd394 --- java/src/com/android/inputmethod/latin/LatinIME.java | 6 +++++- .../src/com/android/inputmethod/latin/SuggestedWords.java | 8 +++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 3ec1fe257..d96b858eb 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -72,6 +72,7 @@ import com.android.inputmethod.latin.suggestions.SuggestionsView; import java.io.FileDescriptor; import java.io.PrintWriter; +import java.util.List; import java.util.Locale; /** @@ -979,8 +980,11 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar return; } + final List applicationSuggestedWords = + SuggestedWords.Builder.getFromApplicationSpecifiedCompletions( + applicationSpecifiedCompletions); SuggestedWords.Builder builder = new SuggestedWords.Builder() - .setApplicationSpecifiedCompletions(applicationSpecifiedCompletions) + .addWords(applicationSuggestedWords, null) .setTypedWordValid(false) .setHasMinimalSuggestion(false); // When in fullscreen mode, show completions generated by the application diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java index 9aa3ebcda..7279a3f0b 100644 --- a/java/src/com/android/inputmethod/latin/SuggestedWords.java +++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java @@ -131,11 +131,13 @@ public class SuggestedWords { return this; } - public Builder setApplicationSpecifiedCompletions(CompletionInfo[] infos) { + public static List getFromApplicationSpecifiedCompletions( + final CompletionInfo[] infos) { + final ArrayList result = new ArrayList(); for (CompletionInfo info : infos) { - if (null != info) addWord(info.getText()); + if (null != info) result.add(info.getText()); } - return this; + return result; } public Builder setTypedWordValid(boolean typedWordValid) {