am 3e35e072: Merge "Make emoji separators" into klp-dev (06e1bdaa) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/latin/LastComposedWord.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}

+4 −3

Original line number	Diff line number	Diff line
		@@ -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) {