Merge "Removed inlinePresentation from Dataset ctor and added setInlinePresentation." into rvc-dev (2f70bc55) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -43016,12 +43016,12 @@ package android.service.autofill {
	}		}

	public static final class Dataset.Builder {		public static final class Dataset.Builder {
	ctor public Dataset.Builder(@NonNull android.widget.RemoteViews, @NonNull android.service.autofill.InlinePresentation);
	ctor public Dataset.Builder(@NonNull android.widget.RemoteViews);		ctor public Dataset.Builder(@NonNull android.widget.RemoteViews);
	ctor public Dataset.Builder();		ctor public Dataset.Builder();
	method @NonNull public android.service.autofill.Dataset build();		method @NonNull public android.service.autofill.Dataset build();
	method @NonNull public android.service.autofill.Dataset.Builder setAuthentication(@Nullable android.content.IntentSender);		method @NonNull public android.service.autofill.Dataset.Builder setAuthentication(@Nullable android.content.IntentSender);
	method @NonNull public android.service.autofill.Dataset.Builder setId(@Nullable String);		method @NonNull public android.service.autofill.Dataset.Builder setId(@Nullable String);
			method @NonNull public android.service.autofill.Dataset.Builder setInlinePresentation(@NonNull android.service.autofill.InlinePresentation);
	method @NonNull public android.service.autofill.Dataset.Builder setValue(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue);		method @NonNull public android.service.autofill.Dataset.Builder setValue(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue);
	method @NonNull public android.service.autofill.Dataset.Builder setValue(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @NonNull android.widget.RemoteViews);		method @NonNull public android.service.autofill.Dataset.Builder setValue(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @NonNull android.widget.RemoteViews);
	method @NonNull public android.service.autofill.Dataset.Builder setValue(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @Nullable java.util.regex.Pattern);		method @NonNull public android.service.autofill.Dataset.Builder setValue(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @Nullable java.util.regex.Pattern);

api/system-current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9798,7 +9798,7 @@ package android.service.autofill {

	public static final class Dataset.Builder {		public static final class Dataset.Builder {
	ctor public Dataset.Builder(@NonNull android.service.autofill.InlinePresentation);		ctor public Dataset.Builder(@NonNull android.service.autofill.InlinePresentation);
	method @NonNull public android.service.autofill.Dataset.Builder setInlinePresentation(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @Nullable java.util.regex.Pattern, @NonNull android.service.autofill.InlinePresentation);		method @NonNull public android.service.autofill.Dataset.Builder setFieldInlinePresentation(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @Nullable java.util.regex.Pattern, @NonNull android.service.autofill.InlinePresentation);
	}		}

	public abstract class InlineSuggestionRenderService extends android.app.Service {		public abstract class InlineSuggestionRenderService extends android.app.Service {

api/test-current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3134,7 +3134,7 @@ package android.service.autofill {

	public static final class Dataset.Builder {		public static final class Dataset.Builder {
	ctor public Dataset.Builder(@NonNull android.service.autofill.InlinePresentation);		ctor public Dataset.Builder(@NonNull android.service.autofill.InlinePresentation);
	method @NonNull public android.service.autofill.Dataset.Builder setInlinePresentation(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @Nullable java.util.regex.Pattern, @NonNull android.service.autofill.InlinePresentation);		method @NonNull public android.service.autofill.Dataset.Builder setFieldInlinePresentation(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @Nullable java.util.regex.Pattern, @NonNull android.service.autofill.InlinePresentation);
	}		}

	public final class DateTransformation extends android.service.autofill.InternalTransformation implements android.os.Parcelable android.service.autofill.Transformation {		public final class DateTransformation extends android.service.autofill.InternalTransformation implements android.os.Parcelable android.service.autofill.Transformation {

core/java/android/service/autofill/Dataset.java

+18 −18

Original line number	Original line	Diff line number	Diff line
	@@ -228,22 +228,6 @@ public final class Dataset implements Parcelable {
	private boolean mDestroyed;		private boolean mDestroyed;
	@Nullable private String mId;		@Nullable private String mId;

	/**
	* Creates a new builder.
	*
	* @param presentation The presentation used to visualize this dataset.
	* @param inlinePresentation The {@link InlinePresentation} used to visualize this dataset
	* as inline suggestions. If the dataset supports inline suggestions,
	* this should not be null.
	*/
	public Builder(@NonNull RemoteViews presentation,
	@NonNull InlinePresentation inlinePresentation) {
	Preconditions.checkNotNull(presentation, "presentation must be non-null");
	Preconditions.checkNotNull(inlinePresentation, "inlinePresentation must be non-null");
	mPresentation = presentation;
	mInlinePresentation = inlinePresentation;
	}

	/**		/**
	* Creates a new builder.		* Creates a new builder.
	*		*
	@@ -281,6 +265,22 @@ public final class Dataset implements Parcelable {
	public Builder() {		public Builder() {
	}		}

			/**
			* Sets the {@link InlinePresentation} used to visualize this dataset as inline suggestions.
			* If the dataset supports inline suggestions this should not be null.
			*
			* @throws IllegalStateException if {@link #build()} was already called.
			*
			* @return this builder.
			*/
			public @NonNull Builder setInlinePresentation(
			@NonNull InlinePresentation inlinePresentation) {
			throwIfDestroyed();
			Preconditions.checkNotNull(inlinePresentation, "inlinePresentation must be non-null");
			mInlinePresentation = inlinePresentation;
			return this;
			}

	/**		/**
	* Triggers a custom UI before before autofilling the screen with the contents of this		* Triggers a custom UI before before autofilling the screen with the contents of this
	* dataset.		* dataset.
	@@ -600,7 +600,7 @@ public final class Dataset implements Parcelable {
	*/		*/
	@SystemApi		@SystemApi
	@TestApi		@TestApi
	public @NonNull Builder setInlinePresentation(@NonNull AutofillId id,		public @NonNull Builder setFieldInlinePresentation(@NonNull AutofillId id,
	@Nullable AutofillValue value, @Nullable Pattern filter,		@Nullable AutofillValue value, @Nullable Pattern filter,
	@NonNull InlinePresentation inlinePresentation) {		@NonNull InlinePresentation inlinePresentation) {
	throwIfDestroyed();		throwIfDestroyed();
	@@ -700,7 +700,7 @@ public final class Dataset implements Parcelable {
	final Builder builder = presentation != null		final Builder builder = presentation != null
	? inlinePresentation == null		? inlinePresentation == null
	? new Builder(presentation)		? new Builder(presentation)
	: new Builder(presentation, inlinePresentation)		: new Builder(presentation).setInlinePresentation(inlinePresentation)
	: inlinePresentation == null		: inlinePresentation == null
	? new Builder()		? new Builder()
	: new Builder(inlinePresentation);		: new Builder(inlinePresentation);