aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java4
-rw-r--r--java/src/com/android/inputmethod/latin/SettingsValues.java4
-rw-r--r--java/src/com/android/inputmethod/latin/Suggest.java6
-rw-r--r--java/src/com/android/inputmethod/latin/SuggestedWords.java11
4 files changed, 13 insertions, 12 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 39cbfa7a0..a7985c37d 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -927,7 +927,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
SuggestedWords.Builder.getFromApplicationSpecifiedCompletions(
applicationSpecifiedCompletions);
SuggestedWords.Builder builder = new SuggestedWords.Builder()
- .addWords(applicationSuggestedWords)
+ .setWords(applicationSuggestedWords)
.setTypedWordValid(false)
.setHasMinimalSuggestion(false);
// When in fullscreen mode, show completions generated by the application
@@ -1787,7 +1787,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
SuggestedWords.Builder.getTypedWordAndPreviousSuggestions(
typedWord, previousSuggestions);
final SuggestedWords.Builder obsoleteSuggestionsBuilder = new SuggestedWords.Builder()
- .addWords(typedWordAndPreviousSuggestions)
+ .setWords(typedWordAndPreviousSuggestions)
.setTypedWordValid(false)
.setHasMinimalSuggestion(false);
diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java
index 7e7702002..9abea66b2 100644
--- a/java/src/com/android/inputmethod/latin/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/SettingsValues.java
@@ -184,7 +184,7 @@ public class SettingsValues {
}
}
final SuggestedWords.Builder builder = new SuggestedWords.Builder()
- .addWords(puncList)
+ .setWords(puncList)
.setIsPunctuationSuggestions();
return builder.build();
}
@@ -204,7 +204,7 @@ public class SettingsValues {
}
}
final SuggestedWords.Builder builder = new SuggestedWords.Builder()
- .addWords(puncOutputTextList)
+ .setWords(puncOutputTextList)
.setIsPunctuationSuggestions();
return builder.build();
}
diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 487e91b0e..a5c70eca9 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -270,7 +270,7 @@ public class Suggest implements Dictionary.WordCallback {
StringUtils.removeDupes(mSuggestions);
return new SuggestedWords.Builder()
- .addWords(SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))
+ .setWords(SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))
.setAllowsToBeAutoCorrected(false)
.setHasAutoCorrection(false);
}
@@ -424,12 +424,12 @@ public class Suggest implements Dictionary.WordCallback {
scoreInfoList.add(new SuggestedWords.SuggestedWordInfo(mSuggestions.get(i),
"--", false));
}
- builder = new SuggestedWords.Builder().addWords(scoreInfoList)
+ builder = new SuggestedWords.Builder().setWords(scoreInfoList)
.setAllowsToBeAutoCorrected(allowsToBeAutoCorrected)
.setHasAutoCorrection(hasAutoCorrection);
} else {
builder = new SuggestedWords.Builder()
- .addWords(SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))
+ .setWords(SuggestedWords.Builder.getFromCharSequenceList(mSuggestions))
.setAllowsToBeAutoCorrected(allowsToBeAutoCorrected)
.setHasAutoCorrection(hasAutoCorrection);
}
diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java
index 9a7ea6b6a..5d0fc20b2 100644
--- a/java/src/com/android/inputmethod/latin/SuggestedWords.java
+++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java
@@ -87,12 +87,13 @@ public class SuggestedWords {
// Nothing to do here.
}
+ // TODO: compatibility for tests. Remove this once tests are okay.
public Builder addWords(List<SuggestedWordInfo> suggestedWordInfoList) {
- final int N = suggestedWordInfoList.size();
- for (int i = 0; i < N; ++i) {
- SuggestedWordInfo suggestedWordInfo = suggestedWordInfoList.get(i);
- addWord(suggestedWordInfo.mWord, suggestedWordInfo);
- }
+ return setWords(suggestedWordInfoList);
+ }
+
+ public Builder setWords(List<SuggestedWordInfo> suggestedWordInfoList) {
+ mSuggestedWordInfoList = suggestedWordInfoList;
return this;
}