Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I7b074c0e145e5900c189bdd5d8faf97f01554e45
This commit is contained in:
Treehugger Robot
2020-08-18 03:17:35 +00:00
committed by Automerger Merge Worker
parent a15f00fbce 2e1b52b1d1
commit 453023d999
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/inputmethod/InputMethodInfo.java
View File

@@ -283,7 +283,7 @@ public final class InputMethodInfo implements Parcelable {
*/ */
public InputMethodInfo(String packageName, String className, public InputMethodInfo(String packageName, String className,
CharSequence label, String settingsActivity) { CharSequence label, String settingsActivity) {
this(buildDummyResolveInfo(packageName, className, label), false /* isAuxIme */, this(buildFakeResolveInfo(packageName, className, label), false /* isAuxIme */,
settingsActivity, null /* subtypes */, 0 /* isDefaultResId */, settingsActivity, null /* subtypes */, 0 /* isDefaultResId */,
false /* forceDefault */, true /* supportsSwitchingToNextInputMethod */, false /* forceDefault */, true /* supportsSwitchingToNextInputMethod */,
false /* isVrOnly */); false /* isVrOnly */);
@@ -319,7 +319,7 @@ public final class InputMethodInfo implements Parcelable {
mIsVrOnly = isVrOnly; mIsVrOnly = isVrOnly;
} }
private static ResolveInfo buildDummyResolveInfo(String packageName, String className, private static ResolveInfo buildFakeResolveInfo(String packageName, String className,
CharSequence label) { CharSequence label) {
ResolveInfo ri = new ResolveInfo(); ResolveInfo ri = new ResolveInfo();
ServiceInfo si = new ServiceInfo(); ServiceInfo si = new ServiceInfo();