commit 9747f8977c55013e656a1e666a1647bb331954ce
author satok <satok@google.com> Mon Sep 12 15:56:40 2011 +0900
committer satok <satok@google.com> Mon Sep 12 15:56:40 2011 +0900
tree cb5b30bce1933a7159b03a502daa89200ff9027d
parent f4b783f8a7f7ba56a879b0fce075257659e9f909

Fix the visiblity of the ime switcher icon.

Bug: 5288866
Change-Id: I99b4aee36c337b2fab1116e9245ddecd826c840c

packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java

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 fd58174..fa8aa6d 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 @@
             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;
             }

services/java/com/android/server/InputMethodManagerService.java

diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index ab70d6c..146bc94 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -1115,7 +1115,9 @@
                 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;
                 }