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

am cbf54dea: Merge "[IL92] Straighten out showSuggestionStripWithTypedWord" 

* commit 'cbf54dea49151e3d8a8dff5074d289ce38dd0698':
  [IL92] Straighten out showSuggestionStripWithTypedWord
main
Jean Chalard 2014-01-27 19:34:05 -08:00 committed by Android Git Automerger
parent ba122b291b cbf54dea49
commit d5259d578b
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1426,7 +1426,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
private void showSuggestionStripWithTypedWord(final SuggestedWords sourceSuggestedWords, private void showSuggestionStripWithTypedWord(final SuggestedWords sourceSuggestedWords,
final String typedWord) { final String typedWord) {
// TODO: refactor this
final SuggestedWords suggestedWords = final SuggestedWords suggestedWords =
sourceSuggestedWords.isEmpty() ? SuggestedWords.EMPTY : sourceSuggestedWords; sourceSuggestedWords.isEmpty() ? SuggestedWords.EMPTY : sourceSuggestedWords;
final String autoCorrection; final String autoCorrection;
@ -1437,13 +1436,9 @@ 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()) { if (SuggestedWords.EMPTY != suggestedWords) {
AccessibilityUtils.getInstance().setAutoCorrection(suggestedWords, typedWord); mInputLogic.mWordComposer.setAutoCorrection(autoCorrection);
setSuggestedWords(suggestedWords);
setAutoCorrectionIndicator(false);
return;
} }
mInputLogic.mWordComposer.setAutoCorrection(autoCorrection);
setSuggestedWords(suggestedWords); setSuggestedWords(suggestedWords);
setAutoCorrectionIndicator(suggestedWords.mWillAutoCorrect); setAutoCorrectionIndicator(suggestedWords.mWillAutoCorrect);
setSuggestionStripShown(isSuggestionsStripVisible()); setSuggestionStripShown(isSuggestionsStripVisible());