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

Commit cb5c7ad1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update InputMethodInfo to comply with Android's inclusive language... 

Merge "Update InputMethodInfo to comply with Android's inclusive language guidance" am: 2e1b52b1 am: 453023d9

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

Change-Id: If474261934e1e78e5144b80804e95818e73b8b0c
parents 6605a825 453023d9

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

+2 −2
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ public final class InputMethodInfo implements Parcelable { 
     */

    public InputMethodInfo(String packageName, String className,

            CharSequence label, String settingsActivity) {

        this(buildDummyResolveInfo(packageName, className, label), false /* isAuxIme */,

        this(buildFakeResolveInfo(packageName, className, label), false /* isAuxIme */,

                settingsActivity, null /* subtypes */, 0 /* isDefaultResId */,

                false /* forceDefault */, true /* supportsSwitchingToNextInputMethod */,

                false /* inlineSuggestionsEnabled */, false /* isVrOnly */);
@@ -344,7 +344,7 @@ public final class InputMethodInfo implements Parcelable { 
        mIsVrOnly = isVrOnly;

    }



    private static ResolveInfo buildDummyResolveInfo(String packageName, String className,

    private static ResolveInfo buildFakeResolveInfo(String packageName, String className,

            CharSequence label) {

        ResolveInfo ri = new ResolveInfo();

        ServiceInfo si = new ServiceInfo();