Merge "Add @UnsupportedAppUsage to the old inline APIs for compatibility" into... (ca9566aa) · Commits · e / os / android_frameworks_base

core/java/android/service/autofill/InlinePresentation.java

+20 −5

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.service.autofill;
		import android.annotation.NonNull;
		import android.annotation.Size;
		import android.app.slice.Slice;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.widget.inline.InlinePresentationSpec;
		@@ -66,9 +67,21 @@ public final class InlinePresentation implements Parcelable {
		return hints.toArray(new String[hints.size()]);
		}

		/**
		* @hide
		* @removed
		*/
		@UnsupportedAppUsage
		public InlinePresentation(
		@NonNull Slice slice,
		@NonNull android.view.inline.InlinePresentationSpec inlinePresentationSpec,
		boolean pinned) {
		this(slice, inlinePresentationSpec.toWidget(), pinned);
		}



		// Code below generated by codegen v1.0.14.
		// Code below generated by codegen v1.0.15.
		//
		// DO NOT MODIFY!
		// CHECKSTYLE:OFF Generated code
		@@ -89,7 +102,8 @@ public final class InlinePresentation implements Parcelable {
		* @param inlinePresentationSpec
		* Specifies the UI specification for the inline suggestion.
		* @param pinned
		* Indicates whether the UI should be pinned, hence non-scrollable, in the host.
		* Indicates whether the UI should be pinned, hence non-scrollable and non-filterable, in the
		* host.
		*/
		@DataClass.Generated.Member
		public InlinePresentation(
		@@ -124,7 +138,8 @@ public final class InlinePresentation implements Parcelable {
		}

		/**
		* Indicates whether the UI should be pinned, hence non-scrollable, in the host.
		* Indicates whether the UI should be pinned, hence non-scrollable and non-filterable, in the
		* host.
		*/
		@DataClass.Generated.Member
		public boolean isPinned() {
		@@ -230,8 +245,8 @@ public final class InlinePresentation implements Parcelable {
		};

		@DataClass.Generated(
		time = 1582753782651L,
		codegenVersion = "1.0.14",
		time = 1585633564226L,
		codegenVersion = "1.0.15",
		sourceFile = "frameworks/base/core/java/android/service/autofill/InlinePresentation.java",
		inputSignatures = "private final @android.annotation.NonNull android.app.slice.Slice mSlice\nprivate final @android.annotation.NonNull android.widget.inline.InlinePresentationSpec mInlinePresentationSpec\nprivate final boolean mPinned\npublic @android.annotation.NonNull @android.annotation.Size(min=0L) java.lang.String[] getAutofillHints()\nclass InlinePresentation extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true, genHiddenConstDefs=true, genEqualsHashCode=true)")
		@Deprecated

core/java/android/view/inline/InlinePresentationSpec.java

+54 −3

Original line number	Diff line number	Diff line
		@@ -18,12 +18,16 @@ package android.view.inline;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.os.Bundle;
		import android.os.Parcelable;
		import android.util.Size;

		import com.android.internal.util.DataClass;

		import java.util.ArrayList;
		import java.util.List;

		/**
		* This class represents the presentation specification by which an inline suggestion
		* should abide when constructing its UI. Since suggestions are inlined in a
		@@ -59,6 +63,48 @@ public final class InlinePresentationSpec implements Parcelable {
		abstract static class BaseBuilder {
		}

		/**
		* @hide
		*/
		public android.widget.inline.InlinePresentationSpec toWidget() {
		final android.widget.inline.InlinePresentationSpec.Builder builder =
		new android.widget.inline.InlinePresentationSpec.Builder(
		getMinSize(), getMaxSize());
		final Bundle style = getStyle();
		if (style != null) {
		builder.setStyle(style);
		}
		return builder.build();
		}

		/**
		* @hide
		*/
		public static android.view.inline.InlinePresentationSpec fromWidget(
		android.widget.inline.InlinePresentationSpec widget) {
		final android.view.inline.InlinePresentationSpec.Builder builder =
		new android.view.inline.InlinePresentationSpec.Builder(
		widget.getMinSize(), widget.getMaxSize());
		final Bundle style = widget.getStyle();
		if (style != null) {
		builder.setStyle(style);
		}
		return builder.build();
		}

		/**
		* @hide
		*/
		public static List<android.view.inline.InlinePresentationSpec> fromWidgets(
		List<android.widget.inline.InlinePresentationSpec> widgets) {
		final ArrayList<android.view.inline.InlinePresentationSpec> convertedSpecs =
		new ArrayList<>();
		for (int i = 0; i < widgets.size(); i++) {
		convertedSpecs.add(fromWidget(widgets.get(i)));
		}
		return convertedSpecs;
		}



		// Code below generated by codegen v1.0.15.
		@@ -93,6 +139,7 @@ public final class InlinePresentationSpec implements Parcelable {
		/**
		* The minimal size of the suggestion.
		*/
		@UnsupportedAppUsage
		@DataClass.Generated.Member
		public @NonNull Size getMinSize() {
		return mMinSize;
		@@ -101,6 +148,7 @@ public final class InlinePresentationSpec implements Parcelable {
		/**
		* The maximal size of the suggestion.
		*/
		@UnsupportedAppUsage
		@DataClass.Generated.Member
		public @NonNull Size getMaxSize() {
		return mMaxSize;
		@@ -235,6 +283,7 @@ public final class InlinePresentationSpec implements Parcelable {
		* @param maxSize
		* The maximal size of the suggestion.
		*/
		@UnsupportedAppUsage
		public Builder(
		@NonNull Size minSize,
		@NonNull Size maxSize) {
		@@ -259,7 +308,9 @@ public final class InlinePresentationSpec implements Parcelable {
		}

		/** Builds the instance. This builder should not be touched after calling this! */
		public @NonNull InlinePresentationSpec build() {
		@UnsupportedAppUsage
		@NonNull
		public InlinePresentationSpec build() {
		checkNotUsed();
		mBuilderFieldsSet \|= 0x8; // Mark builder used

		@@ -282,10 +333,10 @@ public final class InlinePresentationSpec implements Parcelable {
		}

		@DataClass.Generated(
		time = 1585177087499L,
		time = 1585634825103L,
		codegenVersion = "1.0.15",
		sourceFile = "frameworks/base/core/java/android/view/inline/InlinePresentationSpec.java",
		inputSignatures = "private final @android.annotation.NonNull android.util.Size mMinSize\nprivate final @android.annotation.NonNull android.util.Size mMaxSize\nprivate final @android.annotation.Nullable android.os.Bundle mStyle\nprivate static android.os.Bundle defaultStyle()\nclass InlinePresentationSpec extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genBuilder=true)\nclass BaseBuilder extends java.lang.Object implements []")
		inputSignatures = "private final @android.annotation.NonNull android.util.Size mMinSize\nprivate final @android.annotation.NonNull android.util.Size mMaxSize\nprivate final @android.annotation.Nullable android.os.Bundle mStyle\nprivate static android.os.Bundle defaultStyle()\npublic android.widget.inline.InlinePresentationSpec toWidget()\npublic static android.view.inline.InlinePresentationSpec fromWidget(android.widget.inline.InlinePresentationSpec)\npublic static java.util.List<android.view.inline.InlinePresentationSpec> fromWidgets(java.util.List<android.widget.inline.InlinePresentationSpec>)\nclass InlinePresentationSpec extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genBuilder=true)\nclass BaseBuilder extends java.lang.Object implements []")
		@Deprecated
		private void __metadata() {}

core/java/android/view/inputmethod/InlineSuggestionInfo.java

+5 −11

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SuppressLint;
		import android.annotation.TestApi;
		import android.os.Bundle;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.os.Parcelable;
		import android.widget.inline.InlinePresentationSpec;

		@@ -93,15 +93,9 @@ public final class InlineSuggestionInfo implements Parcelable {
		* @hide
		* @removed
		*/
		@UnsupportedAppUsage
		public @NonNull android.view.inline.InlinePresentationSpec getPresentationSpec() {
		final android.view.inline.InlinePresentationSpec.Builder builder =
		new android.view.inline.InlinePresentationSpec.Builder(
		mInlinePresentationSpec.getMinSize(), mInlinePresentationSpec.getMaxSize());
		final Bundle style = mInlinePresentationSpec.getStyle();
		if (style != null) {
		builder.setStyle(style);
		}
		return builder.build();
		return android.view.inline.InlinePresentationSpec.fromWidget(mInlinePresentationSpec);
		}


		@@ -364,10 +358,10 @@ public final class InlineSuggestionInfo implements Parcelable {
		};

		@DataClass.Generated(
		time = 1585528157244L,
		time = 1585633580662L,
		codegenVersion = "1.0.15",
		sourceFile = "frameworks/base/core/java/android/view/inputmethod/InlineSuggestionInfo.java",
		inputSignatures = "public static final @android.view.inputmethod.InlineSuggestionInfo.Source java.lang.String SOURCE_AUTOFILL\npublic static final @android.view.inputmethod.InlineSuggestionInfo.Source java.lang.String SOURCE_PLATFORM\npublic static final @android.view.inputmethod.InlineSuggestionInfo.Type java.lang.String TYPE_SUGGESTION\npublic static final @android.annotation.SuppressLint({\"IntentName\"}) @android.view.inputmethod.InlineSuggestionInfo.Type java.lang.String TYPE_ACTION\nprivate final @android.annotation.NonNull android.widget.inline.InlinePresentationSpec mInlinePresentationSpec\nprivate final @android.annotation.NonNull @android.view.inputmethod.InlineSuggestionInfo.Source java.lang.String mSource\nprivate final @android.annotation.Nullable java.lang.String[] mAutofillHints\nprivate final @android.annotation.NonNull @android.view.inputmethod.InlineSuggestionInfo.Type java.lang.String mType\nprivate final boolean mPinned\npublic static @android.annotation.TestApi @android.annotation.NonNull android.view.inputmethod.InlineSuggestionInfo newInlineSuggestionInfo(android.widget.inline.InlinePresentationSpec,java.lang.String,java.lang.String[],java.lang.String,boolean)\npublic @android.annotation.NonNull android.view.inline.InlinePresentationSpec getPresentationSpec()\nclass InlineSuggestionInfo extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genHiddenConstDefs=true, genHiddenConstructor=true)")
		inputSignatures = "public static final @android.view.inputmethod.InlineSuggestionInfo.Source java.lang.String SOURCE_AUTOFILL\npublic static final @android.view.inputmethod.InlineSuggestionInfo.Source java.lang.String SOURCE_PLATFORM\npublic static final @android.view.inputmethod.InlineSuggestionInfo.Type java.lang.String TYPE_SUGGESTION\npublic static final @android.annotation.SuppressLint({\"IntentName\"}) @android.view.inputmethod.InlineSuggestionInfo.Type java.lang.String TYPE_ACTION\nprivate final @android.annotation.NonNull android.widget.inline.InlinePresentationSpec mInlinePresentationSpec\nprivate final @android.annotation.NonNull @android.view.inputmethod.InlineSuggestionInfo.Source java.lang.String mSource\nprivate final @android.annotation.Nullable java.lang.String[] mAutofillHints\nprivate final @android.annotation.NonNull @android.view.inputmethod.InlineSuggestionInfo.Type java.lang.String mType\nprivate final boolean mPinned\npublic static @android.annotation.TestApi @android.annotation.NonNull android.view.inputmethod.InlineSuggestionInfo newInlineSuggestionInfo(android.widget.inline.InlinePresentationSpec,java.lang.String,java.lang.String[],java.lang.String,boolean)\npublic @android.compat.annotation.UnsupportedAppUsage @android.annotation.NonNull android.view.inline.InlinePresentationSpec getPresentationSpec()\nclass InlineSuggestionInfo extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genHiddenConstDefs=true, genHiddenConstructor=true)")
		@Deprecated
		private void __metadata() {}

core/java/android/view/inputmethod/InlineSuggestionsRequest.java

+11 −65

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.view.inputmethod;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.app.ActivityThread;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.os.Bundle;
		import android.os.IBinder;
		import android.os.LocaleList;
		@@ -98,22 +99,10 @@ public final class InlineSuggestionsRequest implements Parcelable {
		* @hide
		* @removed
		*/
		public @NonNull List<android.view.inline.InlinePresentationSpec> getPresentationSpecs() {
		final ArrayList<android.view.inline.InlinePresentationSpec> convertedSpecs =
		new ArrayList<>();
		for (int i = 0; i < mInlinePresentationSpecs.size(); i++) {
		final android.widget.inline.InlinePresentationSpec currSpec =
		mInlinePresentationSpecs.get(i);
		final android.view.inline.InlinePresentationSpec.Builder builder =
		new android.view.inline.InlinePresentationSpec.Builder(
		currSpec.getMinSize(), currSpec.getMaxSize());
		final Bundle style = currSpec.getStyle();
		if (style != null) {
		builder.setStyle(style);
		}
		convertedSpecs.add(builder.build());
		}
		return convertedSpecs;
		@UnsupportedAppUsage
		@NonNull
		public List<android.view.inline.InlinePresentationSpec> getPresentationSpecs() {
		return android.view.inline.InlinePresentationSpec.fromWidgets(mInlinePresentationSpecs);
		}

		/**
		@@ -177,57 +166,14 @@ public final class InlineSuggestionsRequest implements Parcelable {
		/** @hide */
		abstract static class BaseBuilder {
		/**
		* The {@link android.view.inline.InlinePresentationSpec} for each suggestion in the
		* response. If the max suggestion count is larger than the number of specs in the list,
		* then the last spec is used for the remainder of the suggestions.
		* The list should not be empty.
		*
		* @hide
		* @removed
		*/
		@NonNull Builder setPresentationSpecs(
		@NonNull List<android.view.inline.InlinePresentationSpec> specs) {
		((Builder) this).checkNotUsed();
		((Builder) this).mBuilderFieldsSet \|= 0x2;
		final ArrayList<android.widget.inline.InlinePresentationSpec> convertedSpecs =
		new ArrayList<>();
		for (int i = 0; i < specs.size(); i++) {
		final android.view.inline.InlinePresentationSpec currSpec = specs.get(i);
		final android.widget.inline.InlinePresentationSpec.Builder builder =
		new android.widget.inline.InlinePresentationSpec.Builder(
		currSpec.getMinSize(), currSpec.getMaxSize());
		final Bundle style = currSpec.getStyle();
		if (style != null) {
		builder.setStyle(style);
		}
		convertedSpecs.add(builder.build());
		}
		((Builder) this).mInlinePresentationSpecs = convertedSpecs;
		return ((Builder) this);
		}

		/**
		* @see #setPresentationSpecs
		*
		* @hide
		* @removed
		*/
		public @NonNull Builder addPresentationSpecs(
		@UnsupportedAppUsage
		@NonNull
		public Builder addPresentationSpecs(
		@NonNull android.view.inline.InlinePresentationSpec value) {
		if (((Builder) this).mInlinePresentationSpecs == null) {
		setPresentationSpecs(new ArrayList<>());
		}

		final android.widget.inline.InlinePresentationSpec.Builder builder =
		new android.widget.inline.InlinePresentationSpec.Builder(
		value.getMinSize(), value.getMaxSize());
		final Bundle style = value.getStyle();
		if (style != null) {
		builder.setStyle(style);
		}

		((Builder) this).mInlinePresentationSpecs.add(builder.build());
		return ((Builder) this);
		return ((Builder) this).addInlinePresentationSpecs(value.toWidget());
		}

		abstract Builder setInlinePresentationSpecs(
		@@ -654,10 +600,10 @@ public final class InlineSuggestionsRequest implements Parcelable {
		}

		@DataClass.Generated(
		time = 1585528160885L,
		time = 1585633573804L,
		codegenVersion = "1.0.15",
		sourceFile = "frameworks/base/core/java/android/view/inputmethod/InlineSuggestionsRequest.java",
		inputSignatures = "public static final int SUGGESTION_COUNT_UNLIMITED\nprivate final int mMaxSuggestionCount\nprivate final @android.annotation.NonNull java.util.List<android.widget.inline.InlinePresentationSpec> mInlinePresentationSpecs\nprivate @android.annotation.NonNull java.lang.String mHostPackageName\nprivate @android.annotation.NonNull android.os.LocaleList mSupportedLocales\nprivate @android.annotation.Nullable android.os.Bundle mExtras\nprivate @android.annotation.Nullable android.os.IBinder mHostInputToken\nprivate int mHostDisplayId\npublic @android.annotation.NonNull java.util.List<android.view.inline.InlinePresentationSpec> getPresentationSpecs()\npublic void setHostInputToken(android.os.IBinder)\nprivate void parcelHostInputToken(android.os.Parcel,int)\nprivate @android.annotation.Nullable android.os.IBinder unparcelHostInputToken(android.os.Parcel)\npublic void setHostDisplayId(int)\nprivate void onConstructed()\nprivate static int defaultMaxSuggestionCount()\nprivate static java.lang.String defaultHostPackageName()\nprivate static android.os.LocaleList defaultSupportedLocales()\nprivate static @android.annotation.Nullable android.os.IBinder defaultHostInputToken()\nprivate static @android.annotation.Nullable int defaultHostDisplayId()\nprivate static @android.annotation.Nullable android.os.Bundle defaultExtras()\nclass InlineSuggestionsRequest extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genBuilder=true)\n @android.annotation.NonNull android.view.inputmethod.InlineSuggestionsRequest.Builder setPresentationSpecs(java.util.List<android.view.inline.InlinePresentationSpec>)\npublic @android.annotation.NonNull android.view.inputmethod.InlineSuggestionsRequest.Builder addPresentationSpecs(android.view.inline.InlinePresentationSpec)\nabstract android.view.inputmethod.InlineSuggestionsRequest.Builder setInlinePresentationSpecs(java.util.List<android.widget.inline.InlinePresentationSpec>)\nabstract android.view.inputmethod.InlineSuggestionsRequest.Builder setHostPackageName(java.lang.String)\nabstract android.view.inputmethod.InlineSuggestionsRequest.Builder setHostInputToken(android.os.IBinder)\nabstract android.view.inputmethod.InlineSuggestionsRequest.Builder setHostDisplayId(int)\nclass BaseBuilder extends java.lang.Object implements []")
		inputSignatures = "public static final int SUGGESTION_COUNT_UNLIMITED\nprivate final int mMaxSuggestionCount\nprivate final @android.annotation.NonNull java.util.List<android.widget.inline.InlinePresentationSpec> mInlinePresentationSpecs\nprivate @android.annotation.NonNull java.lang.String mHostPackageName\nprivate @android.annotation.NonNull android.os.LocaleList mSupportedLocales\nprivate @android.annotation.Nullable android.os.Bundle mExtras\nprivate @android.annotation.Nullable android.os.IBinder mHostInputToken\nprivate int mHostDisplayId\npublic @android.compat.annotation.UnsupportedAppUsage @android.annotation.NonNull java.util.List<android.view.inline.InlinePresentationSpec> getPresentationSpecs()\npublic void setHostInputToken(android.os.IBinder)\nprivate void parcelHostInputToken(android.os.Parcel,int)\nprivate @android.annotation.Nullable android.os.IBinder unparcelHostInputToken(android.os.Parcel)\npublic void setHostDisplayId(int)\nprivate void onConstructed()\nprivate static int defaultMaxSuggestionCount()\nprivate static java.lang.String defaultHostPackageName()\nprivate static android.os.LocaleList defaultSupportedLocales()\nprivate static @android.annotation.Nullable android.os.IBinder defaultHostInputToken()\nprivate static @android.annotation.Nullable int defaultHostDisplayId()\nprivate static @android.annotation.Nullable android.os.Bundle defaultExtras()\nclass InlineSuggestionsRequest extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genBuilder=true)\npublic @android.compat.annotation.UnsupportedAppUsage @android.annotation.NonNull android.view.inputmethod.InlineSuggestionsRequest.Builder addPresentationSpecs(android.view.inline.InlinePresentationSpec)\nabstract android.view.inputmethod.InlineSuggestionsRequest.Builder setInlinePresentationSpecs(java.util.List<android.widget.inline.InlinePresentationSpec>)\nabstract android.view.inputmethod.InlineSuggestionsRequest.Builder setHostPackageName(java.lang.String)\nabstract android.view.inputmethod.InlineSuggestionsRequest.Builder setHostInputToken(android.os.IBinder)\nabstract android.view.inputmethod.InlineSuggestionsRequest.Builder setHostDisplayId(int)\nclass BaseBuilder extends java.lang.Object implements []")
		@Deprecated
		private void __metadata() {}