am 1fcdcc92: Merge "Skip loading keyboard when SoftInputWindow hasn\'t shown yet. (DO NOT MERGE)" into ics-mr1

* commit '1fcdcc928ba21a7a1a4d3a64c1d1f8fa399099ff':
  Skip loading keyboard when SoftInputWindow hasn't shown yet. (DO NOT MERGE)
main
Tadashi G. Takaoka 2011-11-17 18:02:41 -08:00 committed by Android Git Automerger
commit 994525cd21
1 changed files with 6 additions and 2 deletions

View File

@ -2100,8 +2100,12 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
// so that we need to re-create the keyboard input view here.
setInputView(mKeyboardSwitcher.onCreateInputView());
}
// 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();
}