summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Cosmin Băieș <cosminbaies@google.com> 2024-03-06 23:56:36 +0100
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> 2024-03-08 10:15:06 +0000
commit093939b89be0a8ca6eed37323f7767dad3a4ea8c (patch)
tree0ee186b10decf229a3a4e1fdc317ab03310a4e7d
parent374e70255bc462251ea8f26dbfc836b2c0ce960d (diff)
Reintroduce InputMethodInfo constructor for CTS
This reintroduces an InputMethodInfo constructor that is required for CTS. In [1] it was modified to include an additonal String, but the original signature is still required. [1]: I18e7c5dc5271bee44e4540b3070b989df4e27c4c Bug: 325708986 Test: atest InputMethodInfoTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2fdc875f2df390f2fbdec5847de64caded33f62c) Merged-In: Iaa5a365f20146f9a3b640a10d3b3f357de322521 Change-Id: Iaa5a365f20146f9a3b640a10d3b3f357de322521
-rw-r--r--core/api/test-current.txt1
-rw-r--r--core/java/android/view/inputmethod/InputMethodInfo.java19
2 files changed, 20 insertions, 0 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index a28dc497c508..2b7fb7a9cdb0 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -3946,6 +3946,7 @@ package android.view.inputmethod {
}
public final class InputMethodInfo implements android.os.Parcelable {
+ ctor public InputMethodInfo(@NonNull String, @NonNull String, @NonNull CharSequence, @NonNull String, boolean, @NonNull String);
ctor public InputMethodInfo(@NonNull String, @NonNull String, @NonNull CharSequence, @NonNull String, @NonNull String, boolean, @NonNull String);
ctor @FlaggedApi("android.view.inputmethod.connectionless_handwriting") public InputMethodInfo(@NonNull String, @NonNull String, @NonNull CharSequence, @NonNull String, @NonNull String, boolean, boolean, @NonNull String);
ctor public InputMethodInfo(@NonNull String, @NonNull String, @NonNull CharSequence, @NonNull String, int);
diff --git a/core/java/android/view/inputmethod/InputMethodInfo.java b/core/java/android/view/inputmethod/InputMethodInfo.java
index 16fecc17d426..8ddc1788a353 100644
--- a/core/java/android/view/inputmethod/InputMethodInfo.java
+++ b/core/java/android/view/inputmethod/InputMethodInfo.java
@@ -499,6 +499,25 @@ public final class InputMethodInfo implements Parcelable {
@TestApi
public InputMethodInfo(@NonNull String packageName, @NonNull String className,
@NonNull CharSequence label, @NonNull String settingsActivity,
+ boolean supportStylusHandwriting,
+ @NonNull String stylusHandwritingSettingsActivityAttr) {
+ this(buildFakeResolveInfo(packageName, className, label), false /* isAuxIme */,
+ settingsActivity, null /* languageSettingsActivity */,
+ null /* subtypes */, 0 /* isDefaultResId */,
+ false /* forceDefault */, true /* supportsSwitchingToNextInputMethod */,
+ false /* inlineSuggestionsEnabled */, false /* isVrOnly */,
+ false /* isVirtualDeviceOnly */, 0 /* handledConfigChanges */,
+ supportStylusHandwriting, false /* supportConnectionlessStylusHandwriting */,
+ stylusHandwritingSettingsActivityAttr, false /* inlineSuggestionsEnabled */);
+ }
+
+ /**
+ * Test API for creating a built-in input method to verify stylus handwriting.
+ * @hide
+ */
+ @TestApi
+ public InputMethodInfo(@NonNull String packageName, @NonNull String className,
+ @NonNull CharSequence label, @NonNull String settingsActivity,
@NonNull String languageSettingsActivity, boolean supportStylusHandwriting,
@NonNull String stylusHandwritingSettingsActivityAttr) {
this(buildFakeResolveInfo(packageName, className, label), false /* isAuxIme */,