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

am aed5819a: Merge "Fix a bug where suggestion would restart at a bad time" 

* commit 'aed5819a84d0d0500de9e6d8dc6c7fad6f0c4edf':
  Fix a bug where suggestion would restart at a bad time
main
Jean Chalard 2012-01-16 22:53:17 -08:00 committed by Android Git Automerger
parent 76916e94b5 aed5819a84
commit a8843c7465
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2093,10 +2093,23 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
&& !mSettingsValues.isWordSeparator(textAfterCursor.charAt(0))) return; && !mSettingsValues.isWordSeparator(textAfterCursor.charAt(0))) return;
// Bail out if word before cursor is 0-length or a single non letter (like an apostrophe) // Bail out if word before cursor is 0-length or a single non letter (like an apostrophe)
// Example: " '|" gets rejected here but "I'|" and "I|" are okay // Example: " -|" gets rejected here but "e-|" and "e|" are okay
final CharSequence word = EditingUtils.getWordAtCursor(ic, mSettingsValues.mWordSeparators); CharSequence word = EditingUtils.getWordAtCursor(ic, mSettingsValues.mWordSeparators);
// We don't suggest on leading single quotes, so we have to remove them from the word if
// it starts with single quotes.
while (!TextUtils.isEmpty(word) && Keyboard.CODE_SINGLE_QUOTE == word.charAt(0)) {
word = word.subSequence(1, word.length());
}
if (TextUtils.isEmpty(word)) return; if (TextUtils.isEmpty(word)) return;
if (word.length() == 1 && !Character.isLetter(word.charAt(0))) return; final char firstChar = word.charAt(0); // we just tested that word is not empty
if (word.length() == 1 && !Character.isLetter(firstChar)) return;
// We only suggest on words that start with a letter or a symbol that is excluded from
// word separators (see #handleCharacterWhileInBatchEdit).
if (!(isAlphabet(firstChar)
|| mSettingsValues.isSymbolExcludedFromWordSeparators(firstChar))) {
return;
}
// Okay, we are at the end of a word. Restart suggestions. // Okay, we are at the end of a word. Restart suggestions.
restartSuggestionsOnWordBeforeCursor(ic, word); restartSuggestionsOnWordBeforeCursor(ic, word);