am 1e39565b: Skip loading keyboard when SoftInputWindow hasn\'t shown yet.

* commit '1e39565bb48d23221145c494d4bf5665b514699d':
  Skip loading keyboard when SoftInputWindow hasn't shown yet.
This commit is contained in:
Tadashi G. Takaoka 2011-11-04 06:37:43 +00:00 committed by Android Git Automerger
commit 445cda6011

View file

@ -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();
}