commit a19c5e63804e6cffac5771b9749aad6c441e5e21
author Jean Chalard <jchalard@google.com> Fri Jun 15 09:03:52 2012 +0900
committer Jean Chalard <jchalard@google.com> Fri Jun 15 09:03:52 2012 +0900
tree 053f52981757af30878c13b7dd511c56ecc092f2
parent 6b9b8e1620f33356e54f6737cc5f4f2522975e59
parent be82f2974bff90ddf3c3bcf9c2cf0dae59c8cf58

resolved conflicts for merge of be82f297 to master

Change-Id: If49ca384ea0ac415a75f8ea1bad77dc6719cb04d

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 b3a0f54..77a0ccf 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1627,7 +1627,7 @@
     }
 
     public boolean isSuggestionsRequested() {
-        // TODO: move this method to mSettingsValues
+        // TODO: move this method to mCurrentSettings
         return (null != mInputAttributes && mInputAttributes.mIsSettingsSuggestionStripOn)
                 && (mCurrentSettings.isCorrectionOn() || isShowingSuggestionsStrip());
     }
@@ -1953,12 +1953,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(mCurrentSettings.mSuggestPuncList, false);
+        if (mCurrentSettings.mBigramPredictionEnabled) {
+            clearSuggestions();
+        } else {
+            setSuggestions(mCurrentSettings.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();