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 am: 453023d999 am: cb5c7ad1fa am: bd9e396d1c

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

Change-Id: Ie40b2f4241e4ed952f95fe41590e93243999aff6
This commit is contained in:
Treehugger Robot
2020-08-18 03:51:02 +00:00
committed by Automerger Merge Worker
parent 3428e2f956 bd9e396d1c
commit d013c0ac14
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

@@ -294,7 +294,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 /* inlineSuggestionsEnabled */, false /* isVrOnly */); false /* inlineSuggestionsEnabled */, false /* isVrOnly */);
@@ -344,7 +344,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();