Merge remote-tracking branch 'goog/master' into merge
This commit is contained in:
commit
dcecc32f3b
1 changed files with 5 additions and 0 deletions
|
@ -1870,6 +1870,11 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
|
||||||
// Notify that language or mode have been changed and toggleLanguage will update KeyboardID
|
// Notify that language or mode have been changed and toggleLanguage will update KeyboardID
|
||||||
// according to new language or mode.
|
// according to new language or mode.
|
||||||
public void onRefreshKeyboard() {
|
public void onRefreshKeyboard() {
|
||||||
|
if (!CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED) {
|
||||||
|
// Before Honeycomb, Voice IME is in LatinIME and it changes the current input view,
|
||||||
|
// so that we need to re-create the keyboard input view here.
|
||||||
|
setInputView(mKeyboardSwitcher.onCreateInputView());
|
||||||
|
}
|
||||||
// Reload keyboard because the current language has been changed.
|
// Reload keyboard because the current language has been changed.
|
||||||
mKeyboardSwitcher.loadKeyboard(getCurrentInputEditorInfo(),
|
mKeyboardSwitcher.loadKeyboard(getCurrentInputEditorInfo(),
|
||||||
mSubtypeSwitcher.isShortcutImeEnabled() && mVoiceProxy.isVoiceButtonEnabled(),
|
mSubtypeSwitcher.isShortcutImeEnabled() && mVoiceProxy.isVoiceButtonEnabled(),
|
||||||
|
|
Loading…
Reference in a new issue