diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | java/res/raw/main_de.dict | bin | 1605716 -> 1605703 bytes | |||
| -rw-r--r-- | java/res/raw/main_en.dict | bin | 1069229 -> 1069220 bytes | |||
| -rw-r--r-- | java/res/raw/main_es.dict | bin | 1138868 -> 1138855 bytes | |||
| -rw-r--r-- | java/res/raw/main_fr.dict | bin | 1328417 -> 1328404 bytes | |||
| -rw-r--r-- | java/res/raw/main_it.dict | bin | 1143332 -> 1143320 bytes | |||
| -rw-r--r-- | java/res/values-en/whitelist.xml | 5 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 13 |
8 files changed, 15 insertions, 6 deletions
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml index 393bc18b8..06d852bb0 100644 --- a/java/AndroidManifest.xml +++ b/java/AndroidManifest.xml @@ -30,7 +30,8 @@ <meta-data android:name="android.view.textservice.scs" android:resource="@xml/spellchecker" /> </service> - <activity android:name="SettingsActivity" android:label="@string/english_ime_settings"> + <activity android:name="SettingsActivity" android:label="@string/english_ime_settings" + android:uiOptions="splitActionBarWhenNarrow"> <intent-filter> <action android:name="android.intent.action.MAIN"/> </intent-filter> diff --git a/java/res/raw/main_de.dict b/java/res/raw/main_de.dict Binary files differindex 68b0dceb2..1a7b305d6 100644 --- a/java/res/raw/main_de.dict +++ b/java/res/raw/main_de.dict diff --git a/java/res/raw/main_en.dict b/java/res/raw/main_en.dict Binary files differindex f544da61a..14865a28e 100644 --- a/java/res/raw/main_en.dict +++ b/java/res/raw/main_en.dict diff --git a/java/res/raw/main_es.dict b/java/res/raw/main_es.dict Binary files differindex 8321c70f8..71370aac2 100644 --- a/java/res/raw/main_es.dict +++ b/java/res/raw/main_es.dict diff --git a/java/res/raw/main_fr.dict b/java/res/raw/main_fr.dict Binary files differindex 084ef7c10..4723961c2 100644 --- a/java/res/raw/main_fr.dict +++ b/java/res/raw/main_fr.dict diff --git a/java/res/raw/main_it.dict b/java/res/raw/main_it.dict Binary files differindex ed260f2a2..00bbdbe90 100644 --- a/java/res/raw/main_it.dict +++ b/java/res/raw/main_it.dict diff --git a/java/res/values-en/whitelist.xml b/java/res/values-en/whitelist.xml index 29a828c7e..0a1646fed 100644 --- a/java/res/values-en/whitelist.xml +++ b/java/res/values-en/whitelist.xml @@ -174,11 +174,6 @@ <item>shouldent</item> <item>shouldn\'t</item> - <!-- TODO: Remove this entry after "yes" gets bumped up in the dictionary. --> - <item>255</item> - <item>tes</item> - <item>yes</item> - <item>255</item> <item>thatd</item> <item>that\'d</item> diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index b474a8558..139eb46ca 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -2291,6 +2291,19 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen break; } } + + if (Keyboard.CODE_DELETE == primaryCode) { + // This is a stopgap solution to avoid leaving a high surrogate alone in a text view. + // In the future, we need to deprecate deteleSurroundingText() and have a surrogate + // pair-friendly way of deleting characters in InputConnection. + final InputConnection ic = getCurrentInputConnection(); + if (null != ic) { + final CharSequence lastChar = ic.getTextBeforeCursor(1, 0); + if (lastChar.length() > 0 && Character.isHighSurrogate(lastChar.charAt(0))) { + ic.deleteSurroundingText(1, 0); + } + } + } } // receive ringer mode change and network state change. |