diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2010-11-24 17:02:50 -0800 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2010-12-01 22:53:06 +0900 |
| commit | 8d7ecc70a6572c288064e41235e4ae8ad5b1b47e (patch) | |
| tree | 65edbd36324a054b4608806f72bc07827f79956d /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | dedb26f639083905c05d94cedc426820b2372937 (diff) | |
| download | latinime-8d7ecc70a6572c288064e41235e4ae8ad5b1b47e.tar.gz latinime-8d7ecc70a6572c288064e41235e4ae8ad5b1b47e.tar.xz latinime-8d7ecc70a6572c288064e41235e4ae8ad5b1b47e.zip | |
Load keyboard only when subtype is keyboard mode
Bug: 3224990
Change-Id: I1ae1d86dce923464d4474fc7ce02f2ff22067603
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 4ef19e831..36c77efaf 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -464,7 +464,8 @@ public class LatinIME extends InputMethodService @Override public void onConfigurationChanged(Configuration conf) { mSubtypeSwitcher.onConfigurationChanged(conf); - onKeyboardLanguageChanged(); + if (mSubtypeSwitcher.isKeyboardMode()) + onKeyboardLanguageChanged(); updateAutoTextEnabled(); // If orientation changed while predicting, commit the change @@ -489,8 +490,7 @@ public class LatinIME extends InputMethodService @Override public View onCreateInputView() { - mKeyboardSwitcher.loadKeyboardView(); - return mKeyboardSwitcher.getInputView(); + return mKeyboardSwitcher.onCreateInputView(); } @Override @@ -524,7 +524,7 @@ public class LatinIME extends InputMethodService return; } - SubtypeSwitcher.getInstance().updateParametersOnStartInputView(); + mSubtypeSwitcher.updateParametersOnStartInputView(); if (mRefreshKeyboardRequired) { mRefreshKeyboardRequired = false; @@ -614,9 +614,12 @@ public class LatinIME extends InputMethodService mJustAddedAutoSpace = false; loadSettings(attribute); - switcher.loadKeyboard(mode, attribute.imeOptions, mVoiceConnector.isVoiceButtonEnabled(), - mVoiceConnector.isVoiceButtonOnPrimary()); - switcher.updateShiftState(); + if (mSubtypeSwitcher.isKeyboardMode()) { + switcher.loadKeyboard(mode, attribute.imeOptions, + mVoiceConnector.isVoiceButtonEnabled(), + mVoiceConnector.isVoiceButtonOnPrimary()); + switcher.updateShiftState(); + } setCandidatesViewShownInternal(isCandidateStripVisible(), false /* needsInputViewShown */ ); |