commit 7cbd0478cfb66f406bb04c3b5c79da37b2263d66
author Jean Chalard <jchalard@google.com> Thu Jun 14 14:37:12 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 14 14:37:13 2012 -0700
tree 2aa540da4c44e9f95a4fe13f34f8eb1ebe120fa6
parent 002e43ead02268ee17033289ab3043511505856b
parent d5b765b3bbceb80b2e145ac7f4d66acbadd1ee4f

Merge "Do not display punctuation suggestions when bigrams are on." into jb-dev

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 1f2982a..97e898a 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -2053,12 +2053,16 @@
             // showSuggestions will retrieve the word near the cursor, we don't want that here)
             showSuggestions(suggestedWords, "");
         } else {
-            if (!isShowingPunctuationList()) setPunctuationSuggestions();
+            clearSuggestions();
         }
     }
 
     public void setPunctuationSuggestions() {
-        setSuggestions(mSettingsValues.mSuggestPuncList, false);
+        if (mSettingsValues.mBigramPredictionEnabled) {
+            clearSuggestions();
+        } else {
+            setSuggestions(mSettingsValues.mSuggestPuncList, false);
+        }
         setAutoCorrectionIndicator(false);
         setSuggestionStripShown(isSuggestionsStripVisible());
     }

java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java

diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java b/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java
index 40e54a4..e86390b 100644
--- a/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java
+++ b/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java
@@ -670,7 +670,7 @@
     }
 
     public void setSuggestions(SuggestedWords suggestedWords) {
-        if (suggestedWords == null || suggestedWords.size() == 0)
+        if (suggestedWords == null)
             return;
 
         clear();