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

Commit 86250745 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 am: cb5c7ad1 am: bd9e396d am: d013c0ac

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

Change-Id: Ie12a0a5aa20362cef67622bd7a2d2348d4395129
parents 29e77b21 d013c0ac

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();