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

am c08119e5: [IL36] Inline setAutoCorrection 

* commit 'c08119e5c1f302cbc35b2c97d948e691ad8e8a59':
  [IL36] Inline setAutoCorrection
main
Jean Chalard 2013-12-25 21:19:33 -08:00 committed by Android Git Automerger
parent 8d2f602609 c08119e5c1
commit e86dc236f5
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1611,19 +1611,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
false /* isPrediction */); false /* isPrediction */);
} }
private void setAutoCorrection(final SuggestedWords suggestedWords, final String typedWord) {
if (suggestedWords.isEmpty()) return;
final String autoCorrection;
if (suggestedWords.mWillAutoCorrect) {
autoCorrection = suggestedWords.getWord(SuggestedWords.INDEX_OF_AUTO_CORRECTION);
} else {
// We can't use suggestedWords.getWord(SuggestedWords.INDEX_OF_TYPED_WORD)
// because it may differ from mWordComposer.mTypedWord.
autoCorrection = typedWord;
}
mInputLogic.mWordComposer.setAutoCorrection(autoCorrection);
}
private void showSuggestionStripWithTypedWord(final SuggestedWords suggestedWords, private void showSuggestionStripWithTypedWord(final SuggestedWords suggestedWords,
final String typedWord) { final String typedWord) {
if (suggestedWords.isEmpty()) { if (suggestedWords.isEmpty()) {
@ -1632,7 +1619,15 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
clearSuggestionStrip(); clearSuggestionStrip();
return; return;
} }
setAutoCorrection(suggestedWords, typedWord); final String autoCorrection;
if (suggestedWords.mWillAutoCorrect) {
autoCorrection = suggestedWords.getWord(SuggestedWords.INDEX_OF_AUTO_CORRECTION);
} else {
// We can't use suggestedWords.getWord(SuggestedWords.INDEX_OF_TYPED_WORD)
// because it may differ from mWordComposer.mTypedWord.
autoCorrection = typedWord;
}
mInputLogic.mWordComposer.setAutoCorrection(autoCorrection);
final boolean isAutoCorrection = suggestedWords.willAutoCorrect(); final boolean isAutoCorrection = suggestedWords.willAutoCorrect();
setSuggestedWords(suggestedWords, isAutoCorrection); setSuggestedWords(suggestedWords, isAutoCorrection);
setAutoCorrectionIndicator(isAutoCorrection); setAutoCorrectionIndicator(isAutoCorrection);