nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am fe97ff40: am 60fb5865: am 06e1bdaa: am 3e35e072: Merge "Make emoji separators" into klp-dev 

* commit 'fe97ff40836e71ef80c35d93367a54088586452e':
  Make emoji separators
main
Ken Wakasa 2013-10-11 05:14:23 -07:00 committed by Android Git Automerger
parent 614a553a70 fe97ff4083
commit a3e90243bb
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/src/com/android/inputmethod/latin/LastComposedWord.java
View File

@ -16,8 +16,6 @@
package com.android.inputmethod.latin; package com.android.inputmethod.latin;
import com.android.inputmethod.latin.utils.StringUtils;
import android.text.TextUtils; import android.text.TextUtils;
/** /**
@ -85,8 +83,4 @@ public final class LastComposedWord {
private boolean didCommitTypedWord() { private boolean didCommitTypedWord() {
return TextUtils.equals(mTypedWord, mCommittedWord); return TextUtils.equals(mTypedWord, mCommittedWord);
} }
public static int getSeparatorLength(final String separatorString) {
return StringUtils.codePointCount(separatorString);
}
} }

7
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -1711,7 +1711,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
mSpaceState = SPACE_STATE_NONE; mSpaceState = SPACE_STATE_NONE;
final boolean didAutoCorrect; final boolean didAutoCorrect;
final SettingsValues settingsValues = mSettings.getCurrent(); 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); didAutoCorrect = handleSeparator(primaryCode, x, y, spaceState);
} else { } else {
didAutoCorrect = false; didAutoCorrect = false;
@ -2978,8 +2979,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
final String originallyTypedWord = mLastComposedWord.mTypedWord; final String originallyTypedWord = mLastComposedWord.mTypedWord;
final String committedWord = mLastComposedWord.mCommittedWord; final String committedWord = mLastComposedWord.mCommittedWord;
final int cancelLength = committedWord.length(); final int cancelLength = committedWord.length();
final int separatorLength = LastComposedWord.getSeparatorLength( // We want java chars, not codepoints for the following.
mLastComposedWord.mSeparatorString); final int separatorLength = mLastComposedWord.mSeparatorString.length();
// TODO: should we check our saved separator against the actual contents of the text view? // TODO: should we check our saved separator against the actual contents of the text view?
final int deleteLength = cancelLength + separatorLength; final int deleteLength = cancelLength + separatorLength;
if (DEBUG) { if (DEBUG) {