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

Commit 453023d9 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 guidance" am: 2e1b52b1 

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

Change-Id: I7b074c0e145e5900c189bdd5d8faf97f01554e45
parents a15f00fb 2e1b52b1

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

+2 −2
Original line number Diff line number Diff line
@@ -283,7 +283,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 /* isVrOnly */);
@@ -319,7 +319,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();