1 files changed, 12 insertions, 9 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 71fd10e83..8768e126e 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1089,7 +1089,10 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
                 - keyboardHeight;
 
         final LayoutParams params = mKeyPreviewBackingView.getLayoutParams();
-        params.height = mSuggestionStripView.setMoreSuggestionsHeight(remainingHeight);
+        mSuggestionStripView.setMoreSuggestionsHeight(remainingHeight);
+
+        // Let the backing cover the remaining region entirely.
+        params.height = remainingHeight;
         mKeyPreviewBackingView.setLayoutParams(params);
         return params.height;
     }
@@ -1210,13 +1213,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
             // Probably never supposed to happen, but just in case.
             return;
         }
-        final String wordToEdit;
-        if (CapsModeUtils.isAutoCapsMode(mInputLogic.mLastComposedWord.mCapitalizedMode)) {
-            wordToEdit = word.toLowerCase(getCurrentSubtypeLocale());
-        } else {
-            wordToEdit = word;
-        }
-        mDictionaryFacilitator.addWordToUserDictionary(this /* context */, wordToEdit);
+        mDictionaryFacilitator.addWordToUserDictionary(this /* context */, word);
     }
 
     // Callback for the {@link SuggestionStripView}, to call when the important notice strip is
@@ -1496,7 +1493,13 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
         if (!hasSuggestionStripView()) {
             return;
         }
-        mSuggestionStripView.showAddToDictionaryHint(word);
+        final String wordToShow;
+        if (CapsModeUtils.isAutoCapsMode(mInputLogic.mLastComposedWord.mCapitalizedMode)) {
+            wordToShow = word.toLowerCase(getCurrentSubtypeLocale());
+        } else {
+            wordToShow = word;
+        }
+        mSuggestionStripView.showAddToDictionaryHint(wordToShow);
     }
 
     // This will show either an empty suggestion strip (if prediction is enabled) or