From 4fbb32f99e7803f5075b7f55e92e5d441c4a2266 Mon Sep 17 00:00:00 2001 From: Andrew Chant Date: Sat, 14 Jan 2023 01:21:16 +0000 Subject: [PATCH] Revert "API for stylus handwriting settings activity" Revert submission 20424609-stylusHandwritingSettingsActivity Reason for revert: git_master is broken yo. Reverted changes: /q/submissionid:20424609-stylusHandwritingSettingsActivity Change-Id: Ic686107a374688530e74fb7724bcc24a6b994fef --- core/api/current.txt | 3 - core/api/test-current.txt | 1 - .../view/inputmethod/InputMethodInfo.java | 75 +------------------ core/res/res/values/attrs.xml | 3 - core/res/res/values/public-staging.xml | 1 - .../view/inputmethod/InputMethodInfoTest.java | 2 - 6 files changed, 1 insertion(+), 84 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index efe04abe2823f..eb2ba0e247b78 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -1489,7 +1489,6 @@ package android { field public static final int strokeLineJoin = 16843788; // 0x101040c field public static final int strokeMiterLimit = 16843789; // 0x101040d field public static final int strokeWidth = 16843783; // 0x1010407 - field public static final int stylusHandwritingSettingsActivity; field public static final int subMenuArrow = 16844019; // 0x10104f3 field public static final int submitBackground = 16843912; // 0x1010488 field public static final int subtitle = 16843473; // 0x10102d1 @@ -54806,7 +54805,6 @@ package android.view.inputmethod { public final class InputMethodInfo implements android.os.Parcelable { ctor public InputMethodInfo(android.content.Context, android.content.pm.ResolveInfo) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException; ctor public InputMethodInfo(String, String, CharSequence, String); - method @Nullable public android.content.Intent createStylusHandwritingSettingsActivityIntent(); method public int describeContents(); method public void dump(android.util.Printer, String); method public android.content.ComponentName getComponent(); @@ -54825,7 +54823,6 @@ package android.view.inputmethod { method public boolean supportsStylusHandwriting(); method public boolean suppressesSpellChecker(); method public void writeToParcel(android.os.Parcel, int); - field public static final String ACTION_STYLUS_HANDWRITING_SETTINGS = "android.view.inputmethod.action.STYLUS_HANDWRITING_SETTINGS"; field @NonNull public static final android.os.Parcelable.Creator CREATOR; } diff --git a/core/api/test-current.txt b/core/api/test-current.txt index d6ce1589d8a63..0b4a70848b7ba 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -3352,7 +3352,6 @@ 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, int); } diff --git a/core/java/android/view/inputmethod/InputMethodInfo.java b/core/java/android/view/inputmethod/InputMethodInfo.java index 6a31818df3510..b7da73247efd5 100644 --- a/core/java/android/view/inputmethod/InputMethodInfo.java +++ b/core/java/android/view/inputmethod/InputMethodInfo.java @@ -22,7 +22,6 @@ import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.ComponentName; import android.content.Context; -import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; @@ -39,7 +38,6 @@ import android.icu.util.ULocale; import android.inputmethodservice.InputMethodService; import android.os.Parcel; import android.os.Parcelable; -import android.text.TextUtils; import android.util.AttributeSet; import android.util.Printer; import android.util.Slog; @@ -73,10 +71,6 @@ import java.util.List; * @attr ref android.R.styleable#InputMethod_configChanges */ public final class InputMethodInfo implements Parcelable { - - public static final String ACTION_STYLUS_HANDWRITING_SETTINGS = - "android.view.inputmethod.action.STYLUS_HANDWRITING_SETTINGS"; - static final String TAG = "InputMethodInfo"; /** @@ -158,11 +152,6 @@ public final class InputMethodInfo implements Parcelable { */ private final boolean mSupportsStylusHandwriting; - /** - * The stylus handwriting setting activity's name, used by the system settings to - * launch the stylus handwriting specific setting activity of this input method. - */ - private final String mStylusHandwritingSettingsActivityAttr; /** * @param service the {@link ResolveInfo} corresponds in which the IME is implemented. @@ -214,7 +203,6 @@ public final class InputMethodInfo implements Parcelable { PackageManager pm = context.getPackageManager(); String settingsActivityComponent = null; - String stylusHandwritingSettingsActivity = null; boolean isVrOnly; int isDefaultResId = 0; @@ -265,9 +253,6 @@ public final class InputMethodInfo implements Parcelable { com.android.internal.R.styleable.InputMethod_configChanges, 0); mSupportsStylusHandwriting = sa.getBoolean( com.android.internal.R.styleable.InputMethod_supportsStylusHandwriting, false); - stylusHandwritingSettingsActivity = sa.getString( - com.android.internal.R.styleable - .InputMethod_stylusHandwritingSettingsActivity); sa.recycle(); final int depth = parser.getDepth(); @@ -343,7 +328,6 @@ public final class InputMethodInfo implements Parcelable { } mSubtypes = new InputMethodSubtypeArray(subtypes); mSettingsActivityName = settingsActivityComponent; - mStylusHandwritingSettingsActivityAttr = stylusHandwritingSettingsActivity; mIsDefaultResId = isDefaultResId; mIsAuxIme = isAuxIme; mSupportsSwitchingToNextInputMethod = supportsSwitchingToNextInputMethod; @@ -370,7 +354,6 @@ public final class InputMethodInfo implements Parcelable { mSubtypes = new InputMethodSubtypeArray(source); mHandledConfigChanges = source.readInt(); mSupportsStylusHandwriting = source.readBoolean(); - mStylusHandwritingSettingsActivityAttr = source.readString8(); mForceDefault = false; } @@ -384,27 +367,9 @@ public final class InputMethodInfo implements Parcelable { false /* forceDefault */, true /* supportsSwitchingToNextInputMethod */, false /* inlineSuggestionsEnabled */, false /* isVrOnly */, 0 /* handledConfigChanges */, false /* supportsStylusHandwriting */, - null /* 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, - boolean supportStylusHandwriting, - @NonNull String stylusHandwritingSettingsActivityAttr) { - this(buildFakeResolveInfo(packageName, className, label), false /* isAuxIme */, - settingsActivity, null /* subtypes */, 0 /* isDefaultResId */, - false /* forceDefault */, true /* supportsSwitchingToNextInputMethod */, - false /* inlineSuggestionsEnabled */, false /* isVrOnly */, - 0 /* handledConfigChanges */, supportStylusHandwriting, - stylusHandwritingSettingsActivityAttr, false /* inlineSuggestionsEnabled */); - } - /** * Temporary API for creating a built-in input method for test. * @hide @@ -418,7 +383,6 @@ public final class InputMethodInfo implements Parcelable { false /* forceDefault */, true /* supportsSwitchingToNextInputMethod */, false /* inlineSuggestionsEnabled */, false /* isVrOnly */, handledConfigChanges, false /* supportsStylusHandwriting */, - null /* stylusHandwritingSettingsActivityAttr */, false /* inlineSuggestionsEnabled */); } @@ -433,7 +397,6 @@ public final class InputMethodInfo implements Parcelable { true /* supportsSwitchingToNextInputMethod */, false /* inlineSuggestionsEnabled */, false /* isVrOnly */, 0 /* handledconfigChanges */, false /* supportsStylusHandwriting */, - null /* stylusHandwritingSettingsActivityAttr */, false /* inlineSuggestionsEnabled */); } @@ -447,7 +410,6 @@ public final class InputMethodInfo implements Parcelable { this(ri, isAuxIme, settingsActivity, subtypes, isDefaultResId, forceDefault, supportsSwitchingToNextInputMethod, false /* inlineSuggestionsEnabled */, isVrOnly, 0 /* handledConfigChanges */, false /* supportsStylusHandwriting */, - null /* stylusHandwritingSettingsActivityAttr */, false /* inlineSuggestionsEnabled */); } @@ -459,7 +421,6 @@ public final class InputMethodInfo implements Parcelable { List subtypes, int isDefaultResId, boolean forceDefault, boolean supportsSwitchingToNextInputMethod, boolean inlineSuggestionsEnabled, boolean isVrOnly, int handledConfigChanges, boolean supportsStylusHandwriting, - String stylusHandwritingSettingsActivityAttr, boolean supportsInlineSuggestionsWithTouchExploration) { final ServiceInfo si = ri.serviceInfo; mService = ri; @@ -478,7 +439,6 @@ public final class InputMethodInfo implements Parcelable { mIsVrOnly = isVrOnly; mHandledConfigChanges = handledConfigChanges; mSupportsStylusHandwriting = supportsStylusHandwriting; - mStylusHandwritingSettingsActivityAttr = stylusHandwritingSettingsActivityAttr; } private static ResolveInfo buildFakeResolveInfo(String packageName, String className, @@ -568,7 +528,6 @@ public final class InputMethodInfo implements Parcelable { * *

A null will be returned if there is no settings activity associated * with the input method.

- * @see #createStylusHandwritingSettingsActivityIntent() */ public String getSettingsActivity() { return mSettingsActivityName; @@ -641,40 +600,11 @@ public final class InputMethodInfo implements Parcelable { /** * Returns if IME supports handwriting using stylus input. * @attr ref android.R.styleable#InputMethod_supportsStylusHandwriting - * @see #createStylusHandwritingSettingsActivityIntent() */ public boolean supportsStylusHandwriting() { return mSupportsStylusHandwriting; } - /** - * Returns {@link Intent} for stylus handwriting settings activity with - * {@link Intent#getAction() Intent action} {@link #ACTION_STYLUS_HANDWRITING_SETTINGS} - * if IME {@link #supportsStylusHandwriting() supports stylus handwriting} or else - * null if there are no associated settings for stylus handwriting / handwriting - * is not supported. - * - *

To launch stylus settings, use this method to get the {@link android.content.Intent} to - * launch the stylus handwriting settings activity.

- *

e.g.

startActivity(createStylusHandwritingSettingsActivityIntent());
-     *

- * - * @attr ref R.styleable#InputMethod_stylusHandwritingSettingsActivity - * @see #getSettingsActivity() - * @see #supportsStylusHandwriting() - */ - @Nullable - public Intent createStylusHandwritingSettingsActivityIntent() { - if (TextUtils.isEmpty(mStylusHandwritingSettingsActivityAttr) - || !mSupportsStylusHandwriting) { - return null; - } - // TODO(b/210039666): consider returning null if component is not enabled. - return new Intent(ACTION_STYLUS_HANDWRITING_SETTINGS).setComponent( - new ComponentName(getServiceInfo().packageName, - mStylusHandwritingSettingsActivityAttr)); - } - public void dump(Printer pw, String prefix) { pw.println(prefix + "mId=" + mId + " mSettingsActivityName=" + mSettingsActivityName @@ -685,9 +615,7 @@ public final class InputMethodInfo implements Parcelable { + mSupportsInlineSuggestionsWithTouchExploration + " mSuppressesSpellChecker=" + mSuppressesSpellChecker + " mShowInInputMethodPicker=" + mShowInInputMethodPicker - + " mSupportsStylusHandwriting=" + mSupportsStylusHandwriting - + " mStylusHandwritingSettingsActivityAttr=" - + mStylusHandwritingSettingsActivityAttr); + + " mSupportsStylusHandwriting=" + mSupportsStylusHandwriting); pw.println(prefix + "mIsDefaultResId=0x" + Integer.toHexString(mIsDefaultResId)); pw.println(prefix + "Service:"); @@ -802,7 +730,6 @@ public final class InputMethodInfo implements Parcelable { mSubtypes.writeToParcel(dest); dest.writeInt(mHandledConfigChanges); dest.writeBoolean(mSupportsStylusHandwriting); - dest.writeString8(mStylusHandwritingSettingsActivityAttr); } /** diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 5851c4eb2fe78..1b6f88f3feee8 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -3763,9 +3763,6 @@ {@link android.inputmethodservice.InputMethodService#onFinishInput()}. --> - - diff --git a/core/res/res/values/public-staging.xml b/core/res/res/values/public-staging.xml index 58b8601e234fd..f4b49e6ce38ef 100644 --- a/core/res/res/values/public-staging.xml +++ b/core/res/res/values/public-staging.xml @@ -128,7 +128,6 @@ - diff --git a/core/tests/coretests/src/android/view/inputmethod/InputMethodInfoTest.java b/core/tests/coretests/src/android/view/inputmethod/InputMethodInfoTest.java index 7bef55e23919f..e7d7d640324d0 100644 --- a/core/tests/coretests/src/android/view/inputmethod/InputMethodInfoTest.java +++ b/core/tests/coretests/src/android/view/inputmethod/InputMethodInfoTest.java @@ -62,8 +62,6 @@ public class InputMethodInfoTest { assertThat(clone.supportsSwitchingToNextInputMethod(), is(false)); assertThat(imi.isInlineSuggestionsEnabled(), is(false)); assertThat(imi.supportsInlineSuggestionsWithTouchExploration(), is(false)); - assertThat(imi.supportsStylusHandwriting(), is(false)); - assertThat(imi.createStylusHandwritingSettingsActivityIntent(), equalTo(null)); } @Test