commit 7a422a0142a025a66078fb9971bf15f8b9c89f38
author Jean Chalard <jchalard@google.com> Fri Jul 06 12:30:09 2012 +0900
committer Jean Chalard <jchalard@google.com> Mon Jul 09 15:06:16 2012 +0900
tree 7827e703b40e669079bdce39efb8ba35920274bd
parent 37eaa24b5a48f5c80bb9ee0fdea477559a2bed1b

Cleanup again (A72)

Change-Id: Id3765bf9826cc2c7ca70158cda53c75dc58f51c6

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 08edbe0..f2dc976 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1663,7 +1663,6 @@
 
     public void updateSuggestionsOrPredictions() {
         mHandler.cancelUpdateSuggestionStrip();
-        final boolean isPredictions = !mWordComposer.isComposingWord();
 
         // Check if we have a suggestion engine attached.
         if (mSuggest == null || !mCurrentSettings.isSuggestionsRequested(mDisplayOrientation)) {
@@ -1677,14 +1676,13 @@
 
         final CharSequence typedWord;
         final SuggestedWords suggestions;
-        // TODO: cleanup the following, those two mean the same thing
-        if (isPredictions || !mWordComposer.isComposingWord()) {
+        if (!mWordComposer.isComposingWord()) {
             if (!mCurrentSettings.mBigramPredictionEnabled) {
                 setPunctuationSuggestions();
                 return;
             }
             typedWord = "";
-            suggestions = updateBigramPredictions(typedWord);
+            suggestions = updateBigramPredictions();
         } else {
             typedWord = mWordComposer.getTypedWord();
             suggestions = updateSuggestions(typedWord);
@@ -1892,7 +1890,7 @@
                 separatorCode, prevWord);
     }
 
-    private SuggestedWords updateBigramPredictions(final CharSequence typedWord) {
+    private SuggestedWords updateBigramPredictions() {
         final CharSequence prevWord = mConnection.getThisWord(mCurrentSettings.mWordSeparators);
         return mSuggest.getSuggestedWords(mWordComposer,
                 prevWord, mKeyboardSwitcher.getKeyboard().getProximityInfo(),