From 60003d51142284b0cf247a2d29bd8844cfba08a4 Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Wed, 30 Apr 2014 20:20:05 +0900 Subject: [PATCH] Fix the unintentional behavior change I0188fa56cba8e introduced an unintentional behavior change regarding the condition when the globe key is displayed if LatinIME is running on KitKat or prior version. With this CL, the previous behavior is back. BUG: 12965588 BUG: 14426646 Change-Id: I112a327dce6ad2e40beb9a60d587e77b3954da82 --- java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java index 0235fde38..0e667bc1c 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java @@ -123,7 +123,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions { builder.setOptions( mSubtypeSwitcher.isShortcutImeEnabled(), settingsValues.mShowsVoiceInputKey, - mLatinIME.shouldSwitchToOtherInputMethods()); + mLatinIME.shouldShowLanguageSwitchKey()); mKeyboardLayoutSet = builder.build(); mCurrentSettingsValues = settingsValues; try {