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

am 173f74bb: Merge "Fixing follow-up to I548d899b" 

* commit '173f74bb18016ccab3e5fad4c86c5201add41c30':
  Fixing follow-up to I548d899b
main
Jean Chalard 2013-06-26 00:38:42 -07:00 committed by Android Git Automerger
parent ee86815fde 173f74bb18
commit 9252ea38a9
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 // text, but that is probably too expensive to do, so we decided to leave things
// as is. // as is.
resetEntireInputState(newSelStart); 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, // 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()) { if (isSuggestionsStripVisible()) {
mHandler.postResumeSuggestions(); mHandler.postResumeSuggestions();
} }
mConnection.userMovedCursor(newSelEnd);
// Reset the last recapitalization. // Reset the last recapitalization.
mRecapitalizeStatus.deactivate(); mRecapitalizeStatus.deactivate();
mKeyboardSwitcher.updateShiftState(); mKeyboardSwitcher.updateShiftState();

8
java/src/com/android/inputmethod/latin/RichInputConnection.java
View File

@ -729,14 +729,6 @@ public final class RichInputConnection {
return (newSelStart - oldSelStart) * (mCurrentCursorPosition - newSelStart) >= 0; 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. * Looks at the text just before the cursor to find out if it looks like a URL.
* *