Merge "Revert "Keep keyboard layout while orientation change""

This commit is contained in:
Tadashi G. Takaoka 2011-07-19 21:22:14 -07:00 committed by Android (Google) Code Review
commit d856b94a7b

View file

@ -152,8 +152,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
boolean voiceButtonOnPrimary) { boolean voiceButtonOnPrimary) {
mSwitchState = SWITCH_STATE_ALPHA; mSwitchState = SWITCH_STATE_ALPHA;
try { try {
final boolean isSymbols = (mCurrentId != null) ? mCurrentId.isSymbolsKeyboard() : false; loadKeyboardInternal(attribute, voiceKeyEnabled, voiceButtonOnPrimary, false);
loadKeyboardInternal(attribute, voiceKeyEnabled, voiceButtonOnPrimary, isSymbols);
} catch (RuntimeException e) { } catch (RuntimeException e) {
// Get KeyboardId to record which keyboard has been failed to load. // Get KeyboardId to record which keyboard has been failed to load.
final KeyboardId id = getKeyboardId(attribute, false); final KeyboardId id = getKeyboardId(attribute, false);