am 2b33fc74: am 17bec5cb: am 92190d9a: Merge "Show the keyboard earlier when rotating."

* commit '2b33fc74b681fbdbb2bd0aee753753236d919f4b':
  Show the keyboard earlier when rotating.
main
Jean Chalard 2013-10-09 21:26:37 -07:00 committed by Android Git Automerger
commit 5ff266e0b1
1 changed files with 5 additions and 4 deletions

View File

@ -926,10 +926,11 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
suggest.setAutoCorrectionThreshold(currentSettingsValues.mAutoCorrectionThreshold); suggest.setAutoCorrectionThreshold(currentSettingsValues.mAutoCorrectionThreshold);
} }
if (canReachInputConnection) { switcher.loadKeyboard(editorInfo, currentSettingsValues);
// If we can't reach the input connection, we don't want to call loadKeyboard yet. if (!canReachInputConnection) {
// It will be done in #retryResetCaches. // If we can't reach the input connection, we will call loadKeyboard again later,
switcher.loadKeyboard(editorInfo, currentSettingsValues); // so we need to save its state now. The call will be done in #retryResetCaches.
switcher.saveKeyboardState();
} }
} else if (restarting) { } else if (restarting) {
// TODO: Come up with a more comprehensive way to reset the keyboard layout when // TODO: Come up with a more comprehensive way to reset the keyboard layout when