diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-10-11 05:05:11 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-10-11 05:05:11 -0700 |
| commit | 06e1bdaa2582293193df7c1b1dd0784b9c327b87 (patch) | |
| tree | eef4a37f6a89a228e4a4ebba29b86291423a9ed6 /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | ac6d0c656e1788d796c3c78434ceb049b43abb42 (diff) | |
| parent | 3e35e0727ce02e29ae498fb09ebc70df7e103d14 (diff) | |
| download | latinime-06e1bdaa2582293193df7c1b1dd0784b9c327b87.tar.gz latinime-06e1bdaa2582293193df7c1b1dd0784b9c327b87.tar.xz latinime-06e1bdaa2582293193df7c1b1dd0784b9c327b87.zip | |
am 3e35e072: Merge "Make emoji separators" into klp-dev
* commit '3e35e0727ce02e29ae498fb09ebc70df7e103d14':
Make emoji separators
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) { |