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

Commit 71fe6e96 authored by Ahaan Ugale's avatar Ahaan Ugale Committed by Automerger Merge Worker
Browse files

Merge "Make InputMethodInfo#showInInputMethodPicker public." into sc-dev am: 6bf4cb61 

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

Change-Id: Ia42d8048b1ea185ccf61a9a02ba933ab7c6ff007
parents f0e2afa8 6bf4cb61

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -51985,6 +51985,7 @@ package android.view.inputmethod { 
    method public int getSubtypeCount();

    method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager);

    method public CharSequence loadLabel(android.content.pm.PackageManager);

    method public boolean shouldShowInInputMethodPicker();

    method public boolean suppressesSpellChecker();

    method public void writeToParcel(android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.view.inputmethod.InputMethodInfo> CREATOR;

core/java/android/view/inputmethod/InputMethodInfo.java

+4 −3
Original line number Diff line number Diff line
@@ -638,10 +638,11 @@ public final class InputMethodInfo implements Parcelable { 
    }



    /**

     * Return {@code true} if this input method should be shown in the IME picker.

     * @hide

     * Returns {@code true} if this input method should be shown in menus for selecting an Input

     * Method, such as the system Input Method Picker. This is {@code false} if the IME is intended

     * to be accessed programmatically.

     */

    public boolean showInInputMethodPicker() {

    public boolean shouldShowInInputMethodPicker() {

        return mShowInInputMethodPicker;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ final class InputMethodSubtypeSwitchingController { 
            final int numImes = imis.size();

            for (int i = 0; i < numImes; ++i) {

                final InputMethodInfo imi = imis.get(i);

                if (forImeMenu && !imi.showInInputMethodPicker()) {

                if (forImeMenu && !imi.shouldShowInInputMethodPicker()) {

                    continue;

                }

                final List<InputMethodSubtype> explicitlyOrImplicitlyEnabledSubtypeList =