aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/res/xml-sw600dp/rows_10_10_7_symbols.xml2
-rw-r--r--java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml2
-rw-r--r--java/res/xml-sw600dp/rows_arabic.xml13
-rw-r--r--java/res/xml-sw600dp/rows_azerty.xml2
-rw-r--r--java/res/xml-sw600dp/rows_bulgarian.xml12
-rw-r--r--java/res/xml-sw600dp/rows_east_slavic.xml17
-rw-r--r--java/res/xml-sw600dp/rows_georgian.xml8
-rw-r--r--java/res/xml-sw600dp/rows_greek.xml8
-rw-r--r--java/res/xml-sw600dp/rows_hebrew.xml22
-rw-r--r--java/res/xml-sw600dp/rows_nordic.xml14
-rw-r--r--java/res/xml-sw600dp/rows_qwerty.xml8
-rw-r--r--java/res/xml-sw600dp/rows_qwertz.xml8
-rw-r--r--java/res/xml-sw600dp/rows_south_slavic.xml16
-rw-r--r--java/res/xml-sw600dp/rows_spanish.xml2
-rw-r--r--java/res/xml-sw600dp/rows_symbols.xml8
-rw-r--r--java/res/xml-sw600dp/rows_symbols_shift.xml4
-rw-r--r--java/src/com/android/inputmethod/latin/SettingsValues.java21
-rw-r--r--java/src/com/android/inputmethod/latin/SuggestedWords.java15
18 files changed, 76 insertions, 106 deletions
diff --git a/java/res/xml-sw600dp/rows_10_10_7_symbols.xml b/java/res/xml-sw600dp/rows_10_10_7_symbols.xml
index 7435b318b..bdb1aa0ee 100644
--- a/java/res/xml-sw600dp/rows_10_10_7_symbols.xml
+++ b/java/res/xml-sw600dp/rows_10_10_7_symbols.xml
@@ -32,7 +32,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols1" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@@ -43,7 +42,6 @@
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
diff --git a/java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml b/java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml
index af2aca2ad..101493423 100644
--- a/java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml
+++ b/java/res/xml-sw600dp/rows_10_10_7_symbols_shift.xml
@@ -32,7 +32,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols_shift1" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@@ -43,7 +42,6 @@
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
diff --git a/java/res/xml-sw600dp/rows_arabic.xml b/java/res/xml-sw600dp/rows_arabic.xml
index 9aecaa648..55223267f 100644
--- a/java/res/xml-sw600dp/rows_arabic.xml
+++ b/java/res/xml-sw600dp/rows_arabic.xml
@@ -24,31 +24,30 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
- latin:keyWidth="8.0%p"
+ latin:keyWidth="7.6%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_arabic1" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="8.0%p"
+ latin:keyWidth="7.6%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_arabic2"
- latin:keyXPos="3.0%p" />
+ latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="8.0%p"
+ latin:keyWidth="7.6%p"
>
<include
- latin:keyboardLayout="@xml/key_smiley" />
+ latin:keyboardLayout="@xml/key_smiley"
+ latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_arabic3" />
</Row>
diff --git a/java/res/xml-sw600dp/rows_azerty.xml b/java/res/xml-sw600dp/rows_azerty.xml
index 8e81346b2..3ec22d302 100644
--- a/java/res/xml-sw600dp/rows_azerty.xml
+++ b/java/res/xml-sw600dp/rows_azerty.xml
@@ -31,7 +31,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@@ -42,7 +41,6 @@
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
diff --git a/java/res/xml-sw600dp/rows_bulgarian.xml b/java/res/xml-sw600dp/rows_bulgarian.xml
index cabd1e6f4..a3b77cc12 100644
--- a/java/res/xml-sw600dp/rows_bulgarian.xml
+++ b/java/res/xml-sw600dp/rows_bulgarian.xml
@@ -24,7 +24,7 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
- latin:keyWidth="7.692%p"
+ latin:keyWidth="7.6%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_bulgarian1"
@@ -34,28 +34,28 @@
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="7.692%p"
+ latin:keyWidth="7.6%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_bulgarian2"
- latin:keyXPos="4.000%p" />
+ latin:keyXPos="4.500%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="7.692%p"
+ latin:keyWidth="7.6%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="10.000%p" />
+ latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_bulgarian3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<include
latin:keyboardLayout="@xml/key_smiley"
- latin:keyXPos="-8.9%p"
+ latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" />
</Row>
<include
diff --git a/java/res/xml-sw600dp/rows_east_slavic.xml b/java/res/xml-sw600dp/rows_east_slavic.xml
index 549da417b..26fd7dfe1 100644
--- a/java/res/xml-sw600dp/rows_east_slavic.xml
+++ b/java/res/xml-sw600dp/rows_east_slavic.xml
@@ -24,7 +24,7 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
- latin:keyWidth="7.60%p"
+ latin:keyWidth="7.6%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_east_slavic1"
@@ -34,33 +34,32 @@
latin:keyLabel="&#x044A;" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="7.60%p"
+ latin:keyWidth="7.6%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_east_slavic2"
- latin:keyXPos="2.25%p" />
+ latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="7.60%p"
+ latin:keyWidth="7.363%p"
>
<Key
- latin:keyStyle="shiftKeyStyle" />
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_east_slavic3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<include
latin:keyboardLayout="@xml/key_smiley"
- latin:keyXPos="-8.9%p"
- latin:keyWidth="fillBoth" />
+ latin:keyXPos="-9.0%p"
+ latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/java/res/xml-sw600dp/rows_georgian.xml b/java/res/xml-sw600dp/rows_georgian.xml
index e8f974781..d4c39af45 100644
--- a/java/res/xml-sw600dp/rows_georgian.xml
+++ b/java/res/xml-sw600dp/rows_georgian.xml
@@ -31,7 +31,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@@ -42,11 +41,10 @@
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="8.9%p"
+ latin:keyWidth="9.0%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
@@ -57,8 +55,8 @@
latin:keyboardLayout="@xml/keys_comma_period" />
<include
latin:keyboardLayout="@xml/key_smiley"
- latin:keyXPos="-8.9%p"
- latin:keyWidth="fillBoth" />
+ latin:keyXPos="-9.0%p"
+ latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/java/res/xml-sw600dp/rows_greek.xml b/java/res/xml-sw600dp/rows_greek.xml
index 66f6247a3..8314222c3 100644
--- a/java/res/xml-sw600dp/rows_greek.xml
+++ b/java/res/xml-sw600dp/rows_greek.xml
@@ -33,7 +33,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@@ -44,11 +43,10 @@
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="8.9%p"
+ latin:keyWidth="9.0%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
@@ -59,8 +57,8 @@
latin:keyboardLayout="@xml/keys_comma_period" />
<include
latin:keyboardLayout="@xml/key_smiley"
- latin:keyXPos="-8.9%p"
- latin:keyWidth="fillBoth" />
+ latin:keyXPos="-9.0%p"
+ latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/java/res/xml-sw600dp/rows_hebrew.xml b/java/res/xml-sw600dp/rows_hebrew.xml
index 519a041c1..a60da3a2b 100644
--- a/java/res/xml-sw600dp/rows_hebrew.xml
+++ b/java/res/xml-sw600dp/rows_hebrew.xml
@@ -24,7 +24,7 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
- latin:keyWidth="9.0%p"
+ latin:keyWidth="8.5%p"
>
<include
latin:keyboardLayout="@xml/keys_apostrophe_dash" />
@@ -32,28 +32,28 @@
latin:keyboardLayout="@xml/rowkeys_hebrew1" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-12.000%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="9.0%p"
+ latin:keyWidth="8.5%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_hebrew2"
latin:keyXPos="4.5%p" />
+ <Key
+ latin:keyStyle="enterKeyStyle"
+ latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="8.9%p"
+ latin:keyWidth="8.5%p"
>
<include
- latin:keyboardLayout="@xml/key_smiley"
- latin:keyWidth="10.0%p" />
+ latin:keyboardLayout="@xml/rowkeys_hebrew3"
+ latin:keyXPos="10.0%p" />
<include
- latin:keyboardLayout="@xml/rowkeys_hebrew3" />
- <Key
- latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-10.400%p"
- latin:keyWidth="fillBoth" />
+ latin:keyboardLayout="@xml/key_smiley"
+ latin:keyXPos="-8.5%p"
+ latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/java/res/xml-sw600dp/rows_nordic.xml b/java/res/xml-sw600dp/rows_nordic.xml
index 48a3048f4..3a8aa1d33 100644
--- a/java/res/xml-sw600dp/rows_nordic.xml
+++ b/java/res/xml-sw600dp/rows_nordic.xml
@@ -24,42 +24,38 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
- latin:keyWidth="7.9%p"
+ latin:keyWidth="7.6%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_nordic1"
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="7.9%p"
+ latin:keyWidth="7.6%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_nordic2"
- latin:keyXPos="3.5%p" />
+ latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="7.9%p"
+ latin:keyWidth="7.6%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
- <Spacer
- latin:keyWidth="4.35%p" />
<include
latin:keyboardLayout="@xml/rowkeys_qwerty3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<include
latin:keyboardLayout="@xml/key_smiley"
- latin:keyXPos="-8.9%p"
+ latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" />
</Row>
<include
diff --git a/java/res/xml-sw600dp/rows_qwerty.xml b/java/res/xml-sw600dp/rows_qwerty.xml
index 49ea58d9b..8e8d5acb6 100644
--- a/java/res/xml-sw600dp/rows_qwerty.xml
+++ b/java/res/xml-sw600dp/rows_qwerty.xml
@@ -31,7 +31,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@@ -42,11 +41,10 @@
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="8.9%p"
+ latin:keyWidth="9.0%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
@@ -57,8 +55,8 @@
latin:keyboardLayout="@xml/keys_comma_period" />
<include
latin:keyboardLayout="@xml/key_smiley"
- latin:keyXPos="-8.9%p"
- latin:keyWidth="fillBoth" />
+ latin:keyXPos="-9.0%p"
+ latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/java/res/xml-sw600dp/rows_qwertz.xml b/java/res/xml-sw600dp/rows_qwertz.xml
index a244bf291..d8f5bc6c7 100644
--- a/java/res/xml-sw600dp/rows_qwertz.xml
+++ b/java/res/xml-sw600dp/rows_qwertz.xml
@@ -31,7 +31,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@@ -42,11 +41,10 @@
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="8.9%p"
+ latin:keyWidth="9.0%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
@@ -57,8 +55,8 @@
latin:keyboardLayout="@xml/keys_comma_period" />
<include
latin:keyboardLayout="@xml/key_smiley"
- latin:keyXPos="-8.9%p"
- latin:keyWidth="fillBoth" />
+ latin:keyXPos="-9.0%p"
+ latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/java/res/xml-sw600dp/rows_south_slavic.xml b/java/res/xml-sw600dp/rows_south_slavic.xml
index 8f0f38ab6..8636cbb24 100644
--- a/java/res/xml-sw600dp/rows_south_slavic.xml
+++ b/java/res/xml-sw600dp/rows_south_slavic.xml
@@ -24,41 +24,39 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
- latin:keyWidth="8.0%p"
+ latin:keyWidth="7.6%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_south_slavic1"
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="7.9%p"
+ latin:keyWidth="7.6%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_south_slavic2"
- latin:keyXPos="2.15%p" />
+ latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="7.5%p"
+ latin:keyWidth="7.363%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="8.0%p" />
+ latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_south_slavic3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<include
latin:keyboardLayout="@xml/key_smiley"
- latin:keyXPos="-8.9%p"
- latin:keyWidth="fillBoth" />
+ latin:keyXPos="-9.0%p"
+ latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/java/res/xml-sw600dp/rows_spanish.xml b/java/res/xml-sw600dp/rows_spanish.xml
index 3628e4b26..9451e42d7 100644
--- a/java/res/xml-sw600dp/rows_spanish.xml
+++ b/java/res/xml-sw600dp/rows_spanish.xml
@@ -31,7 +31,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@@ -42,7 +41,6 @@
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
diff --git a/java/res/xml-sw600dp/rows_symbols.xml b/java/res/xml-sw600dp/rows_symbols.xml
index 6923ce1a5..ea9b30245 100644
--- a/java/res/xml-sw600dp/rows_symbols.xml
+++ b/java/res/xml-sw600dp/rows_symbols.xml
@@ -32,7 +32,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols1" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@@ -43,11 +42,10 @@
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="8.9%p"
+ latin:keyWidth="9.0%p"
>
<Key
latin:keyStyle="toMoreSymbolKeyStyle"
@@ -55,7 +53,9 @@
<include
latin:keyboardLayout="@xml/rowkeys_symbols3" />
<Key
- latin:keyLabel="/" />
+ latin:keyLabel="/"
+ latin:keyXPos="-9.0%p"
+ latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/rows_symbols4" />
diff --git a/java/res/xml-sw600dp/rows_symbols_shift.xml b/java/res/xml-sw600dp/rows_symbols_shift.xml
index 83ca0c1b6..cc66f9676 100644
--- a/java/res/xml-sw600dp/rows_symbols_shift.xml
+++ b/java/res/xml-sw600dp/rows_symbols_shift.xml
@@ -32,7 +32,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols_shift1" />
<Key
latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@@ -43,11 +42,10 @@
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="8.9%p"
+ latin:keyWidth="9.0%p"
>
<Key
latin:keyStyle="backFromMoreSymbolKeyStyle"
diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java
index abd1dc692..1f4909f73 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,34 @@ public class SettingsValues {
}
private static SuggestedWords createSuggestPuncList(final String[] puncs) {
- final SuggestedWords.Builder builder = new SuggestedWords.Builder();
+ final ArrayList<CharSequence> puncList = new ArrayList<CharSequence>();
if (puncs != null) {
for (final String puncSpec : puncs) {
- builder.addWord(KeySpecParser.getLabel(puncSpec));
+ puncList.add(KeySpecParser.getLabel(puncSpec));
}
}
- return builder.setIsPunctuationSuggestions().build();
+ final SuggestedWords.Builder builder = new SuggestedWords.Builder()
+ .addWords(puncList, null)
+ .setIsPunctuationSuggestions();
+ return builder.build();
}
private static SuggestedWords createSuggestPuncOutputTextList(final String[] puncs) {
- final SuggestedWords.Builder builder = new SuggestedWords.Builder();
+ final ArrayList<CharSequence> puncOutputTextList = new ArrayList<CharSequence>();
if (puncs != null) {
for (final String puncSpec : puncs) {
final String outputText = KeySpecParser.getOutputText(puncSpec);
if (outputText != null) {
- builder.addWord(outputText);
+ puncOutputTextList.add(outputText);
} else {
- builder.addWord(KeySpecParser.getLabel(puncSpec));
+ puncOutputTextList.add(KeySpecParser.getLabel(puncSpec));
}
}
}
- return builder.setIsPunctuationSuggestions().build();
+ final SuggestedWords.Builder builder = new SuggestedWords.Builder()
+ .addWords(puncOutputTextList, null)
+ .setIsPunctuationSuggestions();
+ return builder.build();
}
private static String createWordSeparators(final String weakSpaceStrippers,
diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java
index 4a51e796d..9959292cb 100644
--- a/java/src/com/android/inputmethod/latin/SuggestedWords.java
+++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java
@@ -104,17 +104,6 @@ public class SuggestedWords {
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 */
Builder addWord(CharSequence word, SuggestedWordInfo suggestedWordInfo) {
if (!TextUtils.isEmpty(suggestedWordInfo.mWord)) {
@@ -169,14 +158,14 @@ public class SuggestedWords {
SuggestedWords previousSuggestions) {
mSuggestedWordInfoList.clear();
final HashSet<String> alreadySeen = new HashSet<String>();
- addWord(typedWord, null, false);
+ addWord(typedWord, new SuggestedWordInfo(typedWord, null, false));
alreadySeen.add(typedWord.toString());
final int previousSize = previousSuggestions.size();
for (int pos = 1; pos < previousSize; pos++) {
final String prevWord = previousSuggestions.getWord(pos).toString();
// Filter out duplicate suggestion.
if (!alreadySeen.contains(prevWord)) {
- addWord(prevWord, null, true);
+ addWord(prevWord, new SuggestedWordInfo(prevWord, null, true));
alreadySeen.add(prevWord);
}
}
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-05-30 00:06:48 +0000