diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values-en/whitelist.xml | 4 | ||||
| -rw-r--r-- | java/res/values-ru/donottranslate-altchars.xml | 1 | ||||
| -rw-r--r-- | java/res/values/donottranslate-altchars.xml | 1 | ||||
| -rw-r--r-- | java/res/xml/kbd_rows_russian.xml | 2 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java | 5 |
5 files changed, 9 insertions, 4 deletions
diff --git a/java/res/values-en/whitelist.xml b/java/res/values-en/whitelist.xml index 9395f4c88..4a91afb10 100644 --- a/java/res/values-en/whitelist.xml +++ b/java/res/values-en/whitelist.xml @@ -34,5 +34,9 @@ <item>thisd</item> <item>this\'d</item> + <item>255</item> + <item>lets</item> + <item>let\'s</item> + </string-array> </resources> diff --git a/java/res/values-ru/donottranslate-altchars.xml b/java/res/values-ru/donottranslate-altchars.xml index 2da8b8469..2a24e563e 100644 --- a/java/res/values-ru/donottranslate-altchars.xml +++ b/java/res/values-ru/donottranslate-altchars.xml @@ -20,4 +20,5 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="alternates_for_cyrillic_e">5,ё</string> <string name="alternates_for_cyrillic_soft_sign">ъ</string> + <string name="alternates_for_cyrillic_ha">ъ</string> </resources> diff --git a/java/res/values/donottranslate-altchars.xml b/java/res/values/donottranslate-altchars.xml index fbde4b9ba..acd4b3725 100644 --- a/java/res/values/donottranslate-altchars.xml +++ b/java/res/values/donottranslate-altchars.xml @@ -44,6 +44,7 @@ <string name="alternates_for_scandinavia_row2_11"></string> <string name="alternates_for_cyrillic_e"></string> <string name="alternates_for_cyrillic_soft_sign"></string> + <string name="alternates_for_cyrillic_ha"></string> <string name="alternates_for_currency_dollar">¢,£,€,¥,₱</string> <string name="alternates_for_currency_euro">¢,£,$,¥,₱</string> <string name="alternates_for_currency_pound">¢,$,€,¥,₱</string> diff --git a/java/res/xml/kbd_rows_russian.xml b/java/res/xml/kbd_rows_russian.xml index 3aeb52bcc..0c7a23754 100644 --- a/java/res/xml/kbd_rows_russian.xml +++ b/java/res/xml/kbd_rows_russian.xml @@ -69,7 +69,7 @@ latin:popupCharacters="0" /> <Key latin:keyLabel="х" - latin:popupCharacters="@string/alternates_for_cyrillic_soft_sign" + latin:popupCharacters="@string/alternates_for_cyrillic_ha" latin:keyWidth="fillRight" /> </Row> <Row diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java index 21477a992..9937937ff 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java @@ -545,9 +545,8 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha private void setAutomaticTemporaryUpperCase() { if (mKeyboardView == null) return; final Keyboard keyboard = mKeyboardView.getKeyboard(); - if (keyboard != null) { - keyboard.setAutomaticTemporaryUpperCase(); - } + if (keyboard == null) return; + keyboard.setAutomaticTemporaryUpperCase(); mKeyboardView.invalidateAllKeys(); } |