nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Revert "Kill methods with side-effects""

main
Jean Chalard 2012-03-12 19:42:42 -07:00 committed by Android (Google) Code Review
parent ae649580f4 b26af7eae7
commit 70a9bcf8c0
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
java/src/com/android/inputmethod/latin/SettingsValues.java
View File

@ -28,7 +28,6 @@ import com.android.inputmethod.compat.InputTypeCompatUtils;
import com.android.inputmethod.compat.VibratorCompatWrapper; import com.android.inputmethod.compat.VibratorCompatWrapper;
import com.android.inputmethod.keyboard.internal.KeySpecParser; import com.android.inputmethod.keyboard.internal.KeySpecParser;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -175,34 +174,28 @@ public class SettingsValues {
} }
private static SuggestedWords createSuggestPuncList(final String[] puncs) { private static SuggestedWords createSuggestPuncList(final String[] puncs) {
final ArrayList<CharSequence> puncList = new ArrayList<CharSequence>(); final SuggestedWords.Builder builder = new SuggestedWords.Builder();
if (puncs != null) { if (puncs != null) {
for (final String puncSpec : puncs) { for (final String puncSpec : puncs) {
puncList.add(KeySpecParser.getLabel(puncSpec)); builder.addWord(KeySpecParser.getLabel(puncSpec));
} }
} }
final SuggestedWords.Builder builder = new SuggestedWords.Builder() return builder.setIsPunctuationSuggestions().build();
.addWords(puncList, null)
.setIsPunctuationSuggestions();
return builder.build();
} }
private static SuggestedWords createSuggestPuncOutputTextList(final String[] puncs) { private static SuggestedWords createSuggestPuncOutputTextList(final String[] puncs) {
final ArrayList<CharSequence> puncOutputTextList = new ArrayList<CharSequence>(); final SuggestedWords.Builder builder = new SuggestedWords.Builder();
if (puncs != null) { if (puncs != null) {
for (final String puncSpec : puncs) { for (final String puncSpec : puncs) {
final String outputText = KeySpecParser.getOutputText(puncSpec); final String outputText = KeySpecParser.getOutputText(puncSpec);
if (outputText != null) { if (outputText != null) {
puncOutputTextList.add(outputText); builder.addWord(outputText);
} else { } else {
puncOutputTextList.add(KeySpecParser.getLabel(puncSpec)); builder.addWord(KeySpecParser.getLabel(puncSpec));
} }
} }
} }
final SuggestedWords.Builder builder = new SuggestedWords.Builder() return builder.setIsPunctuationSuggestions().build();
.addWords(puncOutputTextList, null)
.setIsPunctuationSuggestions();
return builder.build();
} }
private static String createWordSeparators(final String weakSpaceStrippers, private static String createWordSeparators(final String weakSpaceStrippers,

11
java/src/com/android/inputmethod/latin/SuggestedWords.java
View File

@ -104,6 +104,17 @@ public class SuggestedWords {
return this; return this;
} }
public Builder addWord(CharSequence word) {
return addWord(word, null, false);
}
public Builder addWord(CharSequence word, CharSequence debugString,
boolean isPreviousSuggestedWord) {
SuggestedWordInfo info = new SuggestedWordInfo(word, debugString,
isPreviousSuggestedWord);
return addWord(word, info);
}
/* package for tests */ /* package for tests */
Builder addWord(CharSequence word, SuggestedWordInfo suggestedWordInfo) { Builder addWord(CharSequence word, SuggestedWordInfo suggestedWordInfo) {
if (!TextUtils.isEmpty(suggestedWordInfo.mWord)) { if (!TextUtils.isEmpty(suggestedWordInfo.mWord)) {