diff options
| author |   satok <satok@google.com> | 2011-06-27 22:55:55 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-06-27 22:55:55 +0900 |
| commit | 4ab0645c829178155bc354feb2809477c09d080c (patch) | |
| tree | db4aa6d456ddc843264152f14b4bea49e99d5d9c /java/src | |
| parent | b2d1967e1c8f1de6ad330bfa04bf1de6ef4068a0 (diff) | |
| parent | 7e9615f218630d14ae5666ede2efd5f12d0a23c3 (diff) | |
| download | latinime-4ab0645c829178155bc354feb2809477c09d080c.tar.gz latinime-4ab0645c829178155bc354feb2809477c09d080c.tar.xz latinime-4ab0645c829178155bc354feb2809477c09d080c.zip | |
Merge remote-tracking branch 'goog/master' into merge
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 3b840c8a1..426eb093c 100644 --- 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()) { |