commit d5b765b3bbceb80b2e145ac7f4d66acbadd1ee4f
author Jean Chalard <jchalard@google.com> Fri Jun 15 03:52:48 2012 +0900
committer Jean Chalard <jchalard@google.com> Fri Jun 15 06:01:09 2012 +0900
tree 3555f579c0f2b1b9969d8eb13892c7c426532ca7
parent 3baa7767e8e364364fb0a5b31cdf61b097dec799

Do not display punctuation suggestions when bigrams are on.

Bug: 6310401
Change-Id: I9d31c48e287aceedaf2f4c5129031ddb31402451

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 bfdc1e3..15d3a16 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 3d593aa..14978ce 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();