diff options
| author | 2020-08-18 03:38:49 +0000 | |
|---|---|---|
| committer | 2020-08-18 03:38:49 +0000 | |
| commit | bd9e396d1cc1c86e9e33bfb6744b47891997d4e0 (patch) | |
| tree | 526c016b63dd82e1980d701a6d8b10386a4bc7e2 | |
| parent | e2b9de76dc9e66c7efb12990a8917fe202cb0cef (diff) | |
| parent | cb5c7ad1fa1828285bed68822232d1fc9e4c12af (diff) | |
Merge "Update InputMethodInfo to comply with Android's inclusive language guidance" am: 2e1b52b1d1 am: 453023d999 am: cb5c7ad1fa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1401337
Change-Id: Ia225a60079ace7062e7082be0e7f768dde5f908f
| -rw-r--r-- | core/java/android/view/inputmethod/InputMethodInfo.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/inputmethod/InputMethodInfo.java b/core/java/android/view/inputmethod/InputMethodInfo.java index 28644858377a..7cc347d25458 100644 --- a/core/java/android/view/inputmethod/InputMethodInfo.java +++ b/core/java/android/view/inputmethod/InputMethodInfo.java @@ -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(); |