nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

main
Tadashi G. Takaoka 2011-11-17 18:00:36 -08:00 committed by Android (Google) Code Review
parent b70841f371 60acfdf4a8
commit 1fcdcc928b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/src/com/android/inputmethod/latin/LatinIME.java
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());
}
// 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();
}