Merge remote-tracking branch 'goog/master' into merge

2011-06-27 22:55:55 +09:00 · 2011-06-27 22:55:55 +09:00 · 4ab0645c82
parent b2d1967e1c 7e9615f218
commit 4ab0645c82
1 changed files with 1 additions and 1 deletions
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@ -843,7 +843,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar

    private void setSuggestionStripShownInternal(boolean shown, boolean needsInputViewShown) {
        // TODO: Modify this if we support candidates with hard keyboard
-        if (onEvaluateInputViewShown()) {
+        if (onEvaluateInputViewShown() && mCandidateViewContainer != null) {
            final boolean shouldShowCandidates = shown
                    && (needsInputViewShown ? mKeyboardSwitcher.isInputViewShown() : true);
            if (isExtractViewShown()) {