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

am 5a1f8373: Merge "[IL91] Call reorder" 

* commit '5a1f837356673f04fd68dea8f0b084dc9de7db33':
  [IL91] Call reorder
main
Jean Chalard 2014-01-27 19:28:41 -08:00 committed by Android Git Automerger
parent a4d04eb863 5a1f837356
commit ba122b291b
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1429,13 +1429,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// TODO: refactor this // TODO: refactor this
final SuggestedWords suggestedWords = final SuggestedWords suggestedWords =
sourceSuggestedWords.isEmpty() ? SuggestedWords.EMPTY : sourceSuggestedWords; sourceSuggestedWords.isEmpty() ? SuggestedWords.EMPTY : sourceSuggestedWords;
if (suggestedWords.isEmpty()) {
// No auto-correction is available, clear the cached values.
AccessibilityUtils.getInstance().setAutoCorrection(suggestedWords, typedWord);
setSuggestedWords(suggestedWords);
setAutoCorrectionIndicator(false);
return;
}
final String autoCorrection; final String autoCorrection;
if (suggestedWords.mWillAutoCorrect) { if (suggestedWords.mWillAutoCorrect) {
autoCorrection = suggestedWords.getWord(SuggestedWords.INDEX_OF_AUTO_CORRECTION); autoCorrection = suggestedWords.getWord(SuggestedWords.INDEX_OF_AUTO_CORRECTION);
@ -1444,12 +1437,18 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// because it may differ from mWordComposer.mTypedWord. // because it may differ from mWordComposer.mTypedWord.
autoCorrection = typedWord; autoCorrection = typedWord;
} }
if (suggestedWords.isEmpty()) {
AccessibilityUtils.getInstance().setAutoCorrection(suggestedWords, typedWord);
setSuggestedWords(suggestedWords);
setAutoCorrectionIndicator(false);
return;
}
mInputLogic.mWordComposer.setAutoCorrection(autoCorrection); mInputLogic.mWordComposer.setAutoCorrection(autoCorrection);
setSuggestedWords(suggestedWords); setSuggestedWords(suggestedWords);
setAutoCorrectionIndicator(suggestedWords.mWillAutoCorrect); setAutoCorrectionIndicator(suggestedWords.mWillAutoCorrect);
setSuggestionStripShown(isSuggestionsStripVisible()); setSuggestionStripShown(isSuggestionsStripVisible());
// An auto-correction is available, cache it in accessibility code so // Cache the auto-correction in accessibility code so we can speak it if the user
// we can be speak it if the user touches a key that will insert it. // touches a key that will insert it.
AccessibilityUtils.getInstance().setAutoCorrection(suggestedWords, typedWord); AccessibilityUtils.getInstance().setAutoCorrection(suggestedWords, typedWord);
} }