am 938c0a37: am 364da8c6: Fix - "Touch again to save" not working for manually picked suggestion when re-correction is enabled.

Merge commit '938c0a3722a9c597931e6f75408dc7ab636d7052'

* commit '938c0a3722a9c597931e6f75408dc7ab636d7052':
  Fix - "Touch again to save" not working for manually picked suggestion when re-correction is enabled.

1 files changed, 5 insertions, 2 deletions

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index bd2459e61..687870622 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -817,7 +817,10 @@ public class LatinIME extends InputMethodService
                     } else {
                         abortCorrection(false);
                         // Show the punctuation suggestions list if the current one is not
-                        if (!mSuggestPuncList.equals(mCandidateView.getSuggestions())) {
+                        // and if not showing "Touch again to save".
+                        if (mCandidateView != null
+                                && !mSuggestPuncList.equals(mCandidateView.getSuggestions())
+                                        && !mCandidateView.isShowingAddToDictionaryHint()) {
                             setNextSuggestions();
                         }
                     }
@@ -1935,7 +1938,7 @@ public class LatinIME extends InputMethodService
             TextEntryState.typedCharacter((char) KEYCODE_SPACE, true);
             setNextSuggestions();
         } else if (!showingAddToDictionaryHint) {
-            // If we're not showing the "Touch again to save hint", then show corrections again.
+            // If we're not showing the "Touch again to save", then show corrections again.
             // In case the cursor position doesn't change, make sure we show the suggestions again.
             clearSuggestions();
             postUpdateOldSuggestions();