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

am ff7103d3: Merge "Fix a race condition, take 2." 

* commit 'ff7103d356819952bf040ab851f96a30ed0d3abc':
  Fix a race condition, take 2.
main
Jean Chalard 2014-01-08 00:37:15 -08:00 committed by Android Git Automerger
parent 614bec1551 ff7103d356
commit 83d761456a
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -685,6 +685,10 @@ public final class RichInputConnection {
&& !settingsValues.isWordConnector(codePointBeforeCursor)) { && !settingsValues.isWordConnector(codePointBeforeCursor)) {
return true; return true;
} }
return isCursorFollowedByWordCharacter(settingsValues);
}
public boolean isCursorFollowedByWordCharacter(final SettingsValues settingsValues) {
final CharSequence after = getTextAfterCursor(1, 0); final CharSequence after = getTextAfterCursor(1, 0);
if (!TextUtils.isEmpty(after) && !settingsValues.isWordSeparator(after.charAt(0)) if (!TextUtils.isEmpty(after) && !settingsValues.isWordSeparator(after.charAt(0))
&& !settingsValues.isWordConnector(after.charAt(0))) { && !settingsValues.isWordConnector(after.charAt(0))) {

17
java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
View File

@ -813,7 +813,8 @@ public final class InputLogic {
} }
} }
if (settingsValues.isSuggestionStripVisible() if (settingsValues.isSuggestionStripVisible()
&& settingsValues.mSpacingAndPunctuations.mCurrentLanguageHasSpaces) { && settingsValues.mSpacingAndPunctuations.mCurrentLanguageHasSpaces
&& !mConnection.isCursorFollowedByWordCharacter(settingsValues)) {
restartSuggestionsOnWordTouchedByCursor(settingsValues, restartSuggestionsOnWordTouchedByCursor(settingsValues,
deleteCountAtStart - mDeleteCount /* offset */, deleteCountAtStart - mDeleteCount /* offset */,
true /* includeResumedWordInSuggestions */, keyboardSwitcher); true /* includeResumedWordInSuggestions */, keyboardSwitcher);
@ -1114,11 +1115,19 @@ public final class InputLogic {
keyboardSwitcher.getKeyboard()); keyboardSwitcher.getKeyboard());
mWordComposer.setCursorPositionWithinWord( mWordComposer.setCursorPositionWithinWord(
typedWord.codePointCount(0, numberOfCharsInWordBeforeCursor)); typedWord.codePointCount(0, numberOfCharsInWordBeforeCursor));
// TODO: Change these two lines to setComposingRegion(cursorPosition, // TODO: Change these lines to setComposingRegion(cursorPosition,
// cursorPosition + range.getNumberOfCharsInWordAfterCursor()); // cursorPosition + range.getNumberOfCharsInWordAfterCursor());
mConnection.deleteSurroundingText(numberOfCharsInWordBeforeCursor, if (0 != offset) {
typedWord.length() - numberOfCharsInWordBeforeCursor); // Backspace was pressed. We are at the end of a word, and we don't know the cursor
// position for sure, so use relative methods.
mConnection.deleteSurroundingText(numberOfCharsInWordBeforeCursor, 0);
mConnection.setComposingText(typedWord, 1); mConnection.setComposingText(typedWord, 1);
} else {
// This is recorrection. The cursor position is reasonably reliable, and the cursor
// may be in the middle of a word so use setComposingRegion.
mConnection.setComposingRegion(expectedCursorPosition - numberOfCharsInWordBeforeCursor,
expectedCursorPosition + range.getNumberOfCharsInWordAfterCursor());
}
if (suggestions.isEmpty()) { if (suggestions.isEmpty()) {
// We come here if there weren't any suggestion spans on this word. We will try to // We come here if there weren't any suggestion spans on this word. We will try to
// compute suggestions for it instead. // compute suggestions for it instead.