diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-10-11 11:57:07 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-10-11 11:57:07 +0000 |
| commit | 3e35e0727ce02e29ae498fb09ebc70df7e103d14 (patch) | |
| tree | 1f7f0b797c2171870679e17e9bac955408a937e6 /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | 6d91503727a6d5b4eb942c56ee3f640984ae31a4 (diff) | |
| parent | 401fb908f082d857bf9c972a6ab9318fad4bdf74 (diff) | |
| download | latinime-3e35e0727ce02e29ae498fb09ebc70df7e103d14.tar.gz latinime-3e35e0727ce02e29ae498fb09ebc70df7e103d14.tar.xz latinime-3e35e0727ce02e29ae498fb09ebc70df7e103d14.zip | |
Merge "Make emoji separators" into klp-dev
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 35fb53e36..dc96cd750 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1710,7 +1710,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen mSpaceState = SPACE_STATE_NONE; final boolean didAutoCorrect; final SettingsValues settingsValues = mSettings.getCurrent(); - if (settingsValues.isWordSeparator(primaryCode)) { + if (settingsValues.isWordSeparator(primaryCode) + || Character.getType(primaryCode) == Character.OTHER_SYMBOL) { didAutoCorrect = handleSeparator(primaryCode, x, y, spaceState); } else { didAutoCorrect = false; @@ -2977,8 +2978,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen final String originallyTypedWord = mLastComposedWord.mTypedWord; final String committedWord = mLastComposedWord.mCommittedWord; final int cancelLength = committedWord.length(); - final int separatorLength = LastComposedWord.getSeparatorLength( - mLastComposedWord.mSeparatorString); + // We want java chars, not codepoints for the following. + final int separatorLength = mLastComposedWord.mSeparatorString.length(); // TODO: should we check our saved separator against the actual contents of the text view? final int deleteLength = cancelLength + separatorLength; if (DEBUG) { |