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

am cdd8a1a6: [IL13] Inline restartSuggestionsOnWordBeforeCursor 

* commit 'cdd8a1a69d0fdbf844ab390e22872e2b32f1d664':
  [IL13] Inline restartSuggestionsOnWordBeforeCursor
main
Jean Chalard 2013-12-19 03:52:29 -08:00 committed by Android Git Automerger
parent f84fb3d653 cdd8a1a69d
commit 447f335f27
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -823,10 +823,17 @@ public final class InputLogic {
final CharSequence word = mConnection.getWordBeforeCursorIfAtEndOfWord(settingsValues);
if (null != word) {
final String wordString = word.toString();
restartSuggestionsOnWordBeforeCursor(settingsValues, wordString, keyboardSwitcher,
handler);
mWordComposer.setComposingWord(word,
// Previous word is the 2nd word before cursor because we are restarting on the
// 1st word before cursor.
getNthPreviousWordForSuggestion(settingsValues, 2 /* nthPreviousWord */),
keyboardSwitcher.getKeyboard());
final int length = word.length();
mConnection.deleteSurroundingText(length, 0);
mConnection.setComposingText(word, 1);
handler.postUpdateSuggestionStrip();
// TODO: Handle the case where the user manually moves the cursor and then backs up over
// a separator. In that case, the current log unit should not be uncommitted.
// a separator. In that case, the current log unit should not be uncommitted.
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
ResearchLogger.getInstance().uncommitCurrentLogUnit(wordString,
true /* dumpCurrentLogUnit */);
@ -834,25 +841,6 @@ public final class InputLogic {
}
}
/**
* Restart suggestions on the word passed as an argument, assuming it is before the cursor.
* @param settingsValues the current settings values.
*/
private void restartSuggestionsOnWordBeforeCursor(final SettingsValues settingsValues,
final String word,
// TODO: remove these two arguments
final KeyboardSwitcher keyboardSwitcher, final LatinIME.UIHandler handler) {
mWordComposer.setComposingWord(word,
// Previous word is the 2nd word before cursor because we are restarting on the
// 1st word before cursor.
getNthPreviousWordForSuggestion(settingsValues, 2 /* nthPreviousWord */),
keyboardSwitcher.getKeyboard());
final int length = word.length();
mConnection.deleteSurroundingText(length, 0);
mConnection.setComposingText(word, 1);
handler.postUpdateSuggestionStrip();
}
/**
* Reverts a previous commit with auto-correction.
*