am 06e1bdaa: am 3e35e072: Merge "Make emoji separators" into klp-dev
* commit '06e1bdaa2582293193df7c1b1dd0784b9c327b87': Make emoji separatorsmain
commit
60fb58654e
|
@ -16,8 +16,6 @@
|
|||
|
||||
package com.android.inputmethod.latin;
|
||||
|
||||
import com.android.inputmethod.latin.utils.StringUtils;
|
||||
|
||||
import android.text.TextUtils;
|
||||
|
||||
/**
|
||||
|
@ -85,8 +83,4 @@ public final class LastComposedWord {
|
|||
private boolean didCommitTypedWord() {
|
||||
return TextUtils.equals(mTypedWord, mCommittedWord);
|
||||
}
|
||||
|
||||
public static int getSeparatorLength(final String separatorString) {
|
||||
return StringUtils.codePointCount(separatorString);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in New Issue