diff options
| author | 2011-09-12 15:56:40 +0900 | |
|---|---|---|
| committer | 2011-09-12 15:56:40 +0900 | |
| commit | 9747f8977c55013e656a1e666a1647bb331954ce (patch) | |
| tree | cb5b30bce1933a7159b03a502daa89200ff9027d | |
| parent | f4b783f8a7f7ba56a879b0fce075257659e9f909 (diff) | |
Fix the visiblity of the ime switcher icon.
Bug: 5288866
Change-Id: I99b4aee36c337b2fab1116e9245ddecd826c840c
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java | 4 | ||||
| -rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java index fd58174f7ce3..fa8aa6d1f79e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java @@ -102,7 +102,9 @@ public class InputMethodButton extends ImageView { 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; } diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index ab70d6c6eb77..146bc944724d 100644 --- 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; } |