commit 4cba560dbbd8696673642d1a10d2d433418e54e2
author Jean Chalard <jchalard@google.com> Fri Jun 29 16:00:18 2012 +0900
committer Jean Chalard <jchalard@google.com> Thu Jul 05 17:22:00 2012 +0900
tree 59fccc669de751810dd70fdc3571a2e3f83b4415
parent ea80794dd43d44fe53884b4b8f4567af3d0e8331

Small simplification (A52)

Change-Id: I56bc5b9b584de5a14b41fc32c19f7fefb3b12e88

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 387a3f7..930c9cf 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1934,21 +1934,17 @@
     }
 
     private SuggestedWords updateBigramPredictions(final CharSequence typedWord) {
-        final SuggestedWords suggestedWords;
         if (mCurrentSettings.mCorrectionEnabled) {
             final CharSequence prevWord = mConnection.getThisWord(mCurrentSettings.mWordSeparators);
             if (!TextUtils.isEmpty(prevWord)) {
-                suggestedWords = mSuggest.getSuggestedWords(mWordComposer,
+                // If we call getSuggestedWord with mCorrectionEnabled == false or with
+                // an empty prevWord, we'll get a 0-sized list of suggestions.
+                return mSuggest.getSuggestedWords(mWordComposer,
                         prevWord, mKeyboardSwitcher.getKeyboard().getProximityInfo(),
                         mCurrentSettings.mCorrectionEnabled, true);
-            } else {
-                suggestedWords = null;
             }
-        } else {
-            suggestedWords = null;
         }
-
-        return suggestedWords;
+        return null;
     }
 
     public void setPunctuationSuggestions() {