diff options
Diffstat (limited to 'java')
6 files changed, 6 insertions, 8 deletions
diff --git a/java/res/values-ar/donottranslate-more-keys.xml b/java/res/values-ar/donottranslate-more-keys.xml index 90cc3c85f..c63a9574a 100644 --- a/java/res/values-ar/donottranslate-more-keys.xml +++ b/java/res/values-ar/donottranslate-more-keys.xml @@ -74,4 +74,5 @@ <string name="keyhintlabel_for_dash">"\u064b"</string> <string name="more_keys_for_apostrophe">"\u061f,\u061b,!,:,-,/,\',\""</string> <string name="more_keys_for_dash">"\u0651,\u0652,\u064c,\u0640,\u064f,\u064e,\u0650,\u064b,\u064d"</string> + <string name="more_keys_for_bullet">♪</string> </resources> diff --git a/java/res/values/donottranslate-more-keys.xml b/java/res/values/donottranslate-more-keys.xml index 7e396b690..b610412fa 100644 --- a/java/res/values/donottranslate-more-keys.xml +++ b/java/res/values/donottranslate-more-keys.xml @@ -96,4 +96,5 @@ <string name="keyhintlabel_for_dash">_</string> <string name="more_keys_for_apostrophe">\"</string> <string name="more_keys_for_dash">_</string> + <string name="more_keys_for_bullet">♪,♥,♠,♦,♣</string> </resources> diff --git a/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml b/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml index 73fdf2d3c..8e4751502 100644 --- a/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml +++ b/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml @@ -36,7 +36,7 @@ latin:keyLabel="|" /> <Key latin:keyLabel="•" - latin:moreKeys="♪,♥,♠,♦,♣" /> + latin:moreKeys="@string/more_keys_for_bullet" /> <Key latin:keyLabel="√" /> <Key diff --git a/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml b/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml index ec78d579f..9a9c3a276 100644 --- a/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml +++ b/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml @@ -40,7 +40,7 @@ latin:keyLabel="|" /> <Key latin:keyLabel="•" - latin:moreKeys="♪,♥,♠,♦,♣" /> + latin:moreKeys="@string/more_keys_for_bullet" /> <Key latin:keyLabel="√" /> <Key diff --git a/java/res/xml/kbd_rows_symbols_shift.xml b/java/res/xml/kbd_rows_symbols_shift.xml index 58ae72c6d..91654b04b 100644 --- a/java/res/xml/kbd_rows_symbols_shift.xml +++ b/java/res/xml/kbd_rows_symbols_shift.xml @@ -36,7 +36,7 @@ latin:keyLabel="|" /> <Key latin:keyLabel="•" - latin:moreKeys="♪,♥,♠,♦,♣" /> + latin:moreKeys="@string/more_keys_for_bullet" /> <Key latin:keyLabel="√" /> <Key diff --git a/java/src/com/android/inputmethod/latin/WhitelistDictionary.java b/java/src/com/android/inputmethod/latin/WhitelistDictionary.java index 8f349ce6f..a90ef290b 100644 --- a/java/src/com/android/inputmethod/latin/WhitelistDictionary.java +++ b/java/src/com/android/inputmethod/latin/WhitelistDictionary.java @@ -22,8 +22,6 @@ import android.text.TextUtils; import android.util.Log; import android.util.Pair; -import com.android.inputmethod.keyboard.ProximityInfo; - import java.util.HashMap; import java.util.Locale; @@ -40,9 +38,7 @@ public class WhitelistDictionary extends ExpandableDictionary { super(context, Suggest.DIC_WHITELIST); final Resources res = context.getResources(); final Locale previousLocale = LocaleUtils.setSystemLocale(res, locale); - if (context != null) { - initWordlist(context.getResources().getStringArray(R.array.wordlist_whitelist)); - } + initWordlist(res.getStringArray(R.array.wordlist_whitelist)); LocaleUtils.setSystemLocale(res, previousLocale); } |