Fix the visiblity of the ime switcher icon.

Bug: 5288866 Change-Id: I99b4aee36c337b2fab1116e9245ddecd826c840c
2011-09-12 15:56:40 +09:00
parent f4b783f8a7
commit 9747f8977c
2 changed files with 6 additions and 2 deletions
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -1115,7 +1115,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
                return true;
            } else if (nonAuxCount == 1 && auxCount == 1) {
                if (nonAuxSubtype != null && auxSubtype != null
-                        && nonAuxSubtype.getLocale().equals(auxSubtype.getLocale())
+                        && (nonAuxSubtype.getLocale().equals(auxSubtype.getLocale())
+                                || auxSubtype.overridesImplicitlyEnabledSubtype()
+                                || nonAuxSubtype.overridesImplicitlyEnabledSubtype())
                        && nonAuxSubtype.containsExtraValueKey(TAG_TRY_SUPPRESSING_IME_SWITCHER)) {
                    return false;
                }