Merge "Fix possible NPE in KeyboardSwitcher"
commit
4dc2b9131f
|
@ -315,7 +315,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isShowingEmojiKeyboard() {
|
public boolean isShowingEmojiKeyboard() {
|
||||||
return mEmojiKeyboardView.getVisibility() == View.VISIBLE;
|
return mEmojiKeyboardView != null && mEmojiKeyboardView.getVisibility() == View.VISIBLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isShowingMoreKeysPanel() {
|
public boolean isShowingMoreKeysPanel() {
|
||||||
|
|
Loading…
Reference in New Issue