commit 4c6029e530d121f044c0c7804a4e5641f44b4e09
author Jean Chalard <jchalard@google.com> Fri Jan 24 21:01:05 2014 +0900
committer Jean Chalard <jchalard@google.com> Mon Jan 27 20:38:45 2014 +0900
tree 420fa94b160c89bfa35119638cdf3489a772a0a9
parent c6367ee64d9e301d8c2e920ada57a5550aafa596

[IL92] Straighten out showSuggestionStripWithTypedWord

Bug: 8636060
Change-Id: I066ff29c76349f0ab61441ea5f7bc9085d24bdbc

java/src/com/android/inputmethod/latin/LatinIME.java

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index da16d2f..58f4eb9 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1426,7 +1426,6 @@
 
     private void showSuggestionStripWithTypedWord(final SuggestedWords sourceSuggestedWords,
             final String typedWord) {
-        // TODO: refactor this
         final SuggestedWords suggestedWords =
                 sourceSuggestedWords.isEmpty() ? SuggestedWords.EMPTY : sourceSuggestedWords;
         final String autoCorrection;
@@ -1437,13 +1436,9 @@
             // because it may differ from mWordComposer.mTypedWord.
             autoCorrection = typedWord;
         }
-        if (suggestedWords.isEmpty()) {
-            AccessibilityUtils.getInstance().setAutoCorrection(suggestedWords, typedWord);
-            setSuggestedWords(suggestedWords);
-            setAutoCorrectionIndicator(false);
-            return;
+        if (SuggestedWords.EMPTY != suggestedWords) {
+            mInputLogic.mWordComposer.setAutoCorrection(autoCorrection);
         }
-        mInputLogic.mWordComposer.setAutoCorrection(autoCorrection);
         setSuggestedWords(suggestedWords);
         setAutoCorrectionIndicator(suggestedWords.mWillAutoCorrect);
         setSuggestionStripShown(isSuggestionsStripVisible());