Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the visiblity of the ime switcher icon."

Browse Source
This commit is contained in:
satok
2011-09-12 00:25:41 -07:00
committed by Android (Google) Code Review
parent e00633e49a 9747f8977c
commit d2deee1eeb
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,7 +102,9 @@ public class InputMethodButton extends ImageView {
return true; return true;
} else if (nonAuxCount == 1 && auxCount == 1) { } else if (nonAuxCount == 1 && auxCount == 1) {
if (nonAuxSubtype != null && auxSubtype != null 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)) { && nonAuxSubtype.containsExtraValueKey(TAG_TRY_SUPPRESSING_IME_SWITCHER)) {
return false; return false;
} }

4
services/java/com/android/server/InputMethodManagerService.java
View File

@@ -1115,7 +1115,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
return true; return true;
} else if (nonAuxCount == 1 && auxCount == 1) { } else if (nonAuxCount == 1 && auxCount == 1) {
if (nonAuxSubtype != null && auxSubtype != null 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)) { && nonAuxSubtype.containsExtraValueKey(TAG_TRY_SUPPRESSING_IME_SWITCHER)) {
return false; return false;
} }