am 6d54f9f5: Merge "Fix the unintentional behavior change"

* commit '6d54f9f53cf7a82a0745b0c575cf11d63ec20746':
  Fix the unintentional behavior change
This commit is contained in:
Yohei Yukawa 2014-04-30 11:35:46 +00:00 committed by Android Git Automerger
commit 9bf7caf8f7

View file

@ -123,7 +123,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
builder.setOptions( builder.setOptions(
mSubtypeSwitcher.isShortcutImeEnabled(), mSubtypeSwitcher.isShortcutImeEnabled(),
settingsValues.mShowsVoiceInputKey, settingsValues.mShowsVoiceInputKey,
mLatinIME.shouldSwitchToOtherInputMethods()); mLatinIME.shouldShowLanguageSwitchKey());
mKeyboardLayoutSet = builder.build(); mKeyboardLayoutSet = builder.build();
mCurrentSettingsValues = settingsValues; mCurrentSettingsValues = settingsValues;
try { try {