aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod
diff options
context:
space:
mode:
authorsatok <satok@google.com>2011-06-27 23:55:48 +0900
committersatok <satok@google.com>2011-06-27 23:55:48 +0900
commitdcecc32f3b0df9d66e9049aa7fb9e13745c543d2 (patch)
tree6ad47b8e3cfc1842a63a96e870089dfeb959b1e2 /java/src/com/android/inputmethod
parent4ab0645c829178155bc354feb2809477c09d080c (diff)
parent55303bc63440c6a9547e94b4f3486a00696da9b0 (diff)
downloadlatinime-dcecc32f3b0df9d66e9049aa7fb9e13745c543d2.tar.gz
latinime-dcecc32f3b0df9d66e9049aa7fb9e13745c543d2.tar.xz
latinime-dcecc32f3b0df9d66e9049aa7fb9e13745c543d2.zip
Merge remote-tracking branch 'goog/master' into merge
Diffstat (limited to 'java/src/com/android/inputmethod')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 426eb093c..45f35ec03 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1870,6 +1870,11 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
// Notify that language or mode have been changed and toggleLanguage will update KeyboardID
// according to new language or mode.
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.
mKeyboardSwitcher.loadKeyboard(getCurrentInputEditorInfo(),
mSubtypeSwitcher.isShortcutImeEnabled() && mVoiceProxy.isVoiceButtonEnabled(),