am c5f7d74b: am 5db7eaba: Merge "Accept double-space-period after emoji." (3ab42a00) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+17 −6

Original line number	Diff line number	Diff line
		@@ -1438,11 +1438,21 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		if (!settingsValues.mCorrectionEnabled) return false;
		if (!settingsValues.mUseDoubleSpacePeriod) return false;
		if (!mHandler.isAcceptingDoubleSpacePeriod()) return false;
		final CharSequence lastThree = mConnection.getTextBeforeCursor(3, 0);
		if (lastThree != null && lastThree.length() == 3
		&& canBeFollowedByDoubleSpacePeriod(lastThree.charAt(0))
		&& lastThree.charAt(1) == Constants.CODE_SPACE
		&& lastThree.charAt(2) == Constants.CODE_SPACE) {
		// We only do this when we see two spaces and an accepted code point before the cursor.
		// The code point may be a surrogate pair but the two spaces may not, so we need 4 chars.
		final CharSequence lastThree = mConnection.getTextBeforeCursor(4, 0);
		if (null == lastThree) return false;
		final int length = lastThree.length();
		if (length < 3) return false;
		if (lastThree.charAt(length - 1) != Constants.CODE_SPACE) return false;
		if (lastThree.charAt(length - 2) != Constants.CODE_SPACE) return false;
		// We know there are spaces in pos -1 and -2, and we have at least three chars.
		// If we have only three chars, isSurrogatePairs can't return true as charAt(1) is a space,
		// so this is fine.
		final int firstCodePoint =
		Character.isSurrogatePair(lastThree.charAt(0), lastThree.charAt(1)) ?
		Character.codePointAt(lastThree, 0) : lastThree.charAt(length - 3);
		if (canBeFollowedByDoubleSpacePeriod(firstCodePoint)) {
		mHandler.cancelDoubleSpacePeriodTimer();
		mConnection.deleteSurroundingText(2, 0);
		final String textToInsert = ". ";
		@@ -1467,7 +1477,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		\|\| codePoint == Constants.CODE_CLOSING_SQUARE_BRACKET
		\|\| codePoint == Constants.CODE_CLOSING_CURLY_BRACKET
		\|\| codePoint == Constants.CODE_CLOSING_ANGLE_BRACKET
		\|\| codePoint == Constants.CODE_PLUS;
		\|\| codePoint == Constants.CODE_PLUS
		\|\| Character.getType(codePoint) == Character.OTHER_SYMBOL;
		}

		// Callback for the {@link SuggestionStripView}, to call when the "add to dictionary" hint is

tests/src/com/android/inputmethod/latin/InputLogicTests.java

+11 −4

Original line number	Diff line number	Diff line
		@@ -179,10 +179,17 @@ public class InputLogicTests extends InputTestsBase {
		}

		public void testDoubleSpace() {
		final String STRING_TO_TYPE = "this ";
		final String EXPECTED_RESULT = "this. ";
		type(STRING_TO_TYPE);
		assertEquals("double space make a period", EXPECTED_RESULT, mEditText.getText().toString());
		// U+1F607 is an emoji
		final String[] STRINGS_TO_TYPE =
		new String[] { "this ", "a+ ", "\u1F607 ", ".. ", ") ", "( ", "% " };
		final String[] EXPECTED_RESULTS =
		new String[] { "this. ", "a+. ", "\u1F607. ", ".. ", "). ", "( ", "% " };
		for (int i = 0; i < STRINGS_TO_TYPE.length; ++i) {
		mEditText.setText("");
		type(STRINGS_TO_TYPE[i]);
		assertEquals("double space processing", EXPECTED_RESULTS[i],
		mEditText.getText().toString());
		}
		}

		public void testCancelDoubleSpace() {