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

Commit 88140fd6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Teach IMMS#shouldShowImeSwitcherLocked() about... 

Merge "Teach IMMS#shouldShowImeSwitcherLocked() about shouldShowInInputMethodPicker attr" into sc-dev am: 89681165

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14811983

Change-Id: I46f430f42f19886b671fac45dc663252d6ef9363
parents d50b4afd 89681165

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

+2 −1
Original line number Diff line number Diff line
@@ -2762,7 +2762,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
            return false;

        }



        List<InputMethodInfo> imis = mSettings.getEnabledInputMethodListLocked();

        List<InputMethodInfo> imis = mSettings.getEnabledInputMethodListWithFilterLocked(

                InputMethodInfo::shouldShowInInputMethodPicker);

        final int N = imis.size();

        if (N > 2) return true;

        if (N < 1) return false;

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

+12 −3
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import java.util.Arrays; 
import java.util.LinkedHashSet;

import java.util.List;

import java.util.Locale;

import java.util.function.Predicate;



/**

 * This class provides random static utility methods for {@link InputMethodManagerService} and its
@@ -946,8 +947,14 @@ final class InputMethodUtils { 
        }



        ArrayList<InputMethodInfo> getEnabledInputMethodListLocked() {

            return getEnabledInputMethodListWithFilterLocked(null /* matchingCondition */);

        }



        @NonNull

        ArrayList<InputMethodInfo> getEnabledInputMethodListWithFilterLocked(

                @Nullable Predicate<InputMethodInfo> matchingCondition) {

            return createEnabledInputMethodListLocked(

                    getEnabledInputMethodsAndSubtypeListLocked());

                    getEnabledInputMethodsAndSubtypeListLocked(), matchingCondition);

        }



        List<InputMethodSubtype> getEnabledInputMethodSubtypeListLocked(
@@ -1036,11 +1043,13 @@ final class InputMethodUtils { 
        }



        private ArrayList<InputMethodInfo> createEnabledInputMethodListLocked(

                List<Pair<String, ArrayList<String>>> imsList) {

                List<Pair<String, ArrayList<String>>> imsList,

                Predicate<InputMethodInfo> matchingCondition) {

            final ArrayList<InputMethodInfo> res = new ArrayList<>();

            for (Pair<String, ArrayList<String>> ims: imsList) {

                InputMethodInfo info = mMethodMap.get(ims.first);

                if (info != null && !info.isVrOnly()) {

                if (info != null && !info.isVrOnly()

                        && (matchingCondition == null || matchingCondition.test(info))) {

                    res.add(info);

                }

            }