Merge "Fixing follow-up to I548d899b" (173f74bb) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -968,6 +968,13 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		// text, but that is probably too expensive to do, so we decided to leave things
		// as is.
		resetEntireInputState(newSelStart);
		} else {
		// resetEntireInputState calls resetCachesUponCursorMove, but with the second
		// argument as true. But in all cases where we don't reset the entire input state,
		// we still want to tell the rich input connection about the new cursor position so
		// that it can update its caches.
		mConnection.resetCachesUponCursorMove(newSelStart,
		false /* shouldFinishComposition */);
		}

		// We moved the cursor. If we are touching a word, we need to resume suggestion,
		@@ -975,7 +982,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		if (isSuggestionsStripVisible()) {
		mHandler.postResumeSuggestions();
		}
		mConnection.userMovedCursor(newSelEnd);
		// Reset the last recapitalization.
		mRecapitalizeStatus.deactivate();
		mKeyboardSwitcher.updateShiftState();

+0 −8

Original line number	Diff line number	Diff line
		@@ -729,14 +729,6 @@ public final class RichInputConnection {
		return (newSelStart - oldSelStart) * (mCurrentCursorPosition - newSelStart) >= 0;
		}

		/**
		* The user moved the cursor by hand. Take a note of it.
		* @param newCursorPosition The new cursor position.
		*/
		public void userMovedCursor(final int newCursorPosition) {
		mCurrentCursorPosition = newCursorPosition;
		}

		/**
		* Looks at the text just before the cursor to find out if it looks like a URL.
		*