Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2deee1e authored by satok's avatar satok Committed by Android (Google) Code Review
Browse files

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

parents e00633e4 9747f897

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

+3 −1
Original line number Diff line number Diff line
@@ -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;

            }

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

+3 −1
Original line number Diff line number Diff line
@@ -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;

                }