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

Commit 7c25e788 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Respect shouldShowInInputMethodPicker again 

This is a follow up CL to my previous CL [1], which inlined

  InputMethodSubtypeSwitchingController
      #getSortedInputMethodAndSubtypeListForImeMenuLocked

for simplicity with accidentally flipping "forImeMenu" parameter [2]
from true to false.

With this CL, "forImeMenu" becomes true again as it used to be.

 [1]: Ibcc03107665975f237f6d7e0ee098d82e49d54ba
      46e75da5
 [2]: I18dda0525168f9195606840239507b9daba65be7
      43dbb549

Bug: 309868254
Bug: 309837937
Test: presubmit
Change-Id: I3ca6f1abfb46048772c63a984859fc61554a5b35
parent 80ba92cf

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

+2 −2
Original line number Diff line number Diff line
@@ -4869,8 +4869,8 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 


                    final List<ImeSubtypeListItem> imList = InputMethodSubtypeSwitchingController

                            .getSortedInputMethodAndSubtypeList(

                                    showAuxSubtypes, isScreenLocked, false, mContext,

                                    mMethodMap, mSettings.getCurrentUserId());

                                    showAuxSubtypes, isScreenLocked, true /* forImeMenu */,

                                    mContext, mMethodMap, mSettings.getCurrentUserId());

                    mMenuController.showInputMethodMenuLocked(showAuxSubtypes, displayId,

                            lastInputMethodId, lastInputMethodSubtypeId, imList);

                }