Merge remote-tracking branch 'goog/master' into merge
This commit is contained in:
commit
4ab0645c82
1 changed files with 1 additions and 1 deletions
|
@ -843,7 +843,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
|
||||||
|
|
||||||
private void setSuggestionStripShownInternal(boolean shown, boolean needsInputViewShown) {
|
private void setSuggestionStripShownInternal(boolean shown, boolean needsInputViewShown) {
|
||||||
// TODO: Modify this if we support candidates with hard keyboard
|
// TODO: Modify this if we support candidates with hard keyboard
|
||||||
if (onEvaluateInputViewShown()) {
|
if (onEvaluateInputViewShown() && mCandidateViewContainer != null) {
|
||||||
final boolean shouldShowCandidates = shown
|
final boolean shouldShowCandidates = shown
|
||||||
&& (needsInputViewShown ? mKeyboardSwitcher.isInputViewShown() : true);
|
&& (needsInputViewShown ? mKeyboardSwitcher.isInputViewShown() : true);
|
||||||
if (isExtractViewShown()) {
|
if (isExtractViewShown()) {
|
||||||
|
|
Loading…
Reference in a new issue