diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-11-04 06:37:43 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-11-04 06:37:43 +0000 |
| commit | 445cda6011b521d895a6ea1e102a26895901098a (patch) | |
| tree | d2453a8b4688a5088dd2999331d5b1bf54dd8a9c /java/src | |
| parent | 17be905b0c8040dada0a234afbe7598d93682c67 (diff) | |
| parent | 1e39565bb48d23221145c494d4bf5665b514699d (diff) | |
| download | latinime-445cda6011b521d895a6ea1e102a26895901098a.tar.gz latinime-445cda6011b521d895a6ea1e102a26895901098a.tar.xz latinime-445cda6011b521d895a6ea1e102a26895901098a.zip | |
am 1e39565b: Skip loading keyboard when SoftInputWindow hasn\'t shown yet.
* commit '1e39565bb48d23221145c494d4bf5665b514699d':
Skip loading keyboard when SoftInputWindow hasn't shown yet.
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index fd833157d..a6a3a5c88 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -2169,8 +2169,12 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar // 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(), mSettingsValues); + // When the device locale is changed in SetupWizard etc., this method may get called via + // onConfigurationChanged before SoftInputWindow is shown. + if (mKeyboardSwitcher.getKeyboardView() != null) { + // Reload keyboard because the current language has been changed. + mKeyboardSwitcher.loadKeyboard(getCurrentInputEditorInfo(), mSettingsValues); + } initSuggest(); loadSettings(); } |