am 92190d9a: Merge "Show the keyboard earlier when rotating."

* commit '92190d9a756b7bad95648075828b23e61340358d':
  Show the keyboard earlier when rotating.
This commit is contained in:
Jean Chalard 2013-10-08 03:15:55 -07:00 committed by Android Git Automerger
commit 17bec5cb1c

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