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

Commit 45aaef93 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Android (Google) Code Review
Browse files

Merge "Simplify IMMS#shouldShowImeSwitcherLocked()" into main

parents b050e836 584dcb60

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

+3 −1
Original line number Diff line number Diff line
@@ -2635,7 +2635,9 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
        if (mMenuController.getSwitchingDialogLocked() != null) return false;

        // When we are switching IMEs, the IME switcher button should be hidden.

        final var userData = mUserDataRepository.getOrCreate(mCurrentUserId);

        if (!Objects.equals(userData.mBindingController.getCurId(), getSelectedMethodIdLocked())) {

        final var bindingController = userData.mBindingController;

        if (!Objects.equals(bindingController.getCurId(),

                bindingController.getSelectedMethodId())) {

            return false;

        }

        if (mWindowManagerInternal.isKeyguardShowingAndNotOccluded()