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

am db0adf86: Merge "[IL55] Remove a useless argument." 

* commit 'db0adf86a4c615ca8838238a1c318b1fbc05111e':
  [IL55] Remove a useless argument.
main
Jean Chalard 2014-01-10 03:37:54 -08:00 committed by Android Git Automerger
parent c35d5abe6f db0adf86a4
commit b19c09797a
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,7 +202,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
break; break;
case MSG_RESUME_SUGGESTIONS: case MSG_RESUME_SUGGESTIONS:
latinIme.mInputLogic.restartSuggestionsOnWordTouchedByCursor( latinIme.mInputLogic.restartSuggestionsOnWordTouchedByCursor(
latinIme.mSettings.getCurrent(), 0 /* offset */, latinIme.mSettings.getCurrent(),
false /* includeResumedWordInSuggestions */, latinIme.mKeyboardSwitcher); false /* includeResumedWordInSuggestions */, latinIme.mKeyboardSwitcher);
break; break;
case MSG_REOPEN_DICTIONARIES: case MSG_REOPEN_DICTIONARIES:

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

@ -816,7 +816,6 @@ public final class InputLogic {
&& settingsValues.mSpacingAndPunctuations.mCurrentLanguageHasSpaces && settingsValues.mSpacingAndPunctuations.mCurrentLanguageHasSpaces
&& !mConnection.isCursorFollowedByWordCharacter(settingsValues)) { && !mConnection.isCursorFollowedByWordCharacter(settingsValues)) {
restartSuggestionsOnWordTouchedByCursor(settingsValues, restartSuggestionsOnWordTouchedByCursor(settingsValues,
deleteCountAtStart - mDeleteCount /* offset */,
true /* includeResumedWordInSuggestions */, keyboardSwitcher); true /* includeResumedWordInSuggestions */, keyboardSwitcher);
} }
// We just removed at least one character. We need to update the auto-caps state. // We just removed at least one character. We need to update the auto-caps state.
@ -1043,13 +1042,12 @@ public final class InputLogic {
* do nothing. * do nothing.
* *
* @param settingsValues the current values of the settings. * @param settingsValues the current values of the settings.
* @param offset how much the cursor is expected to have moved since the last updateSelection.
* @param includeResumedWordInSuggestions whether to include the word on which we resume * @param includeResumedWordInSuggestions whether to include the word on which we resume
* suggestions in the suggestion list. * suggestions in the suggestion list.
*/ */
// TODO: make this private. // TODO: make this private.
public void restartSuggestionsOnWordTouchedByCursor(final SettingsValues settingsValues, public void restartSuggestionsOnWordTouchedByCursor(final SettingsValues settingsValues,
final int offset, final boolean includeResumedWordInSuggestions, final boolean includeResumedWordInSuggestions,
// TODO: Remove this argument. // TODO: Remove this argument.
final KeyboardSwitcher keyboardSwitcher) { final KeyboardSwitcher keyboardSwitcher) {
// HACK: We may want to special-case some apps that exhibit bad behavior in case of // HACK: We may want to special-case some apps that exhibit bad behavior in case of
@ -1109,19 +1107,8 @@ public final class InputLogic {
keyboardSwitcher.getKeyboard()); keyboardSwitcher.getKeyboard());
mWordComposer.setCursorPositionWithinWord( mWordComposer.setCursorPositionWithinWord(
typedWord.codePointCount(0, numberOfCharsInWordBeforeCursor)); typedWord.codePointCount(0, numberOfCharsInWordBeforeCursor));
// TODO: Change these lines to setComposingRegion(cursorPosition, mConnection.setComposingRegion(expectedCursorPosition - numberOfCharsInWordBeforeCursor,
// cursorPosition + range.getNumberOfCharsInWordAfterCursor());
if (0 != offset) {
// 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);
} 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()); 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.