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.
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index bd2459e..6878706 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -817,7 +817,10 @@
} 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 @@
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();