Merge "Run codegen v15 on inline suggestion data classes" into rvc-dev am:... (ca9752cb) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -56812,7 +56812,7 @@ package android.view.inline {
	public static final class InlinePresentationSpec.Builder {		public static final class InlinePresentationSpec.Builder {
	ctor public InlinePresentationSpec.Builder(@NonNull android.util.Size, @NonNull android.util.Size);		ctor public InlinePresentationSpec.Builder(@NonNull android.util.Size, @NonNull android.util.Size);
	method @NonNull public android.view.inline.InlinePresentationSpec build();		method @NonNull public android.view.inline.InlinePresentationSpec build();
	method @NonNull public android.view.inline.InlinePresentationSpec.Builder setStyle(@Nullable android.os.Bundle);		method @NonNull public android.view.inline.InlinePresentationSpec.Builder setStyle(@NonNull android.os.Bundle);
	}		}

	}		}
	@@ -57024,7 +57024,7 @@ package android.view.inputmethod {
	ctor public InlineSuggestionsRequest.Builder(@NonNull java.util.List<android.view.inline.InlinePresentationSpec>);		ctor public InlineSuggestionsRequest.Builder(@NonNull java.util.List<android.view.inline.InlinePresentationSpec>);
	method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder addPresentationSpecs(@NonNull android.view.inline.InlinePresentationSpec);		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder addPresentationSpecs(@NonNull android.view.inline.InlinePresentationSpec);
	method @NonNull public android.view.inputmethod.InlineSuggestionsRequest build();		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest build();
	method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setExtras(@Nullable android.os.Bundle);		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setExtras(@NonNull android.os.Bundle);
	method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setMaxSuggestionCount(int);		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setMaxSuggestionCount(int);
	method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setSupportedLocales(@NonNull android.os.LocaleList);		method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setSupportedLocales(@NonNull android.os.LocaleList);
	}		}

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

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -58,7 +58,7 @@ public final class InlinePresentationSpec implements Parcelable {



	// Code below generated by codegen v1.0.14.		// Code below generated by codegen v1.0.15.
	//		//
	// DO NOT MODIFY!		// DO NOT MODIFY!
	// CHECKSTYLE:OFF Generated code		// CHECKSTYLE:OFF Generated code
	@@ -104,8 +104,8 @@ public final class InlinePresentationSpec implements Parcelable {
	}		}

	/**		/**
	* The extras encoding the UI style information. Defaults to null in which case the default		* The extras encoding the UI style information. Defaults to {@code null} in which case the
	* system UI style will be used.		* default system UI style will be used.
	*/		*/
	@DataClass.Generated.Member		@DataClass.Generated.Member
	public @Nullable Bundle getStyle() {		public @Nullable Bundle getStyle() {
	@@ -244,11 +244,11 @@ public final class InlinePresentationSpec implements Parcelable {
	}		}

	/**		/**
	* The extras encoding the UI style information. Defaults to null in which case the default		* The extras encoding the UI style information. Defaults to {@code null} in which case the
	* system UI style will be used.		* default system UI style will be used.
	*/		*/
	@DataClass.Generated.Member		@DataClass.Generated.Member
	public @NonNull Builder setStyle(@Nullable Bundle value) {		public @NonNull Builder setStyle(@NonNull Bundle value) {
	checkNotUsed();		checkNotUsed();
	mBuilderFieldsSet \|= 0x4;		mBuilderFieldsSet \|= 0x4;
	mStyle = value;		mStyle = value;
	@@ -279,8 +279,8 @@ public final class InlinePresentationSpec implements Parcelable {
	}		}

	@DataClass.Generated(		@DataClass.Generated(
	time = 1582078731418L,		time = 1584067238741L,
	codegenVersion = "1.0.14",		codegenVersion = "1.0.15",
	sourceFile = "frameworks/base/core/java/android/view/inline/InlinePresentationSpec.java",		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()\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		@Deprecated

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

+4 −6

Original line number	Original line	Diff line number	Diff line
	@@ -72,7 +72,6 @@ public final class InlineSuggestionsRequest implements Parcelable {
	/**		/**
	* The extras state propagated from the IME to pass extra data.		* The extras state propagated from the IME to pass extra data.
	*/		*/
	@DataClass.MaySetToNull
	private @Nullable Bundle mExtras;		private @Nullable Bundle mExtras;

	/**		/**
	@@ -81,7 +80,6 @@ public final class InlineSuggestionsRequest implements Parcelable {
	*		*
	* @hide		* @hide
	*/		*/
	@DataClass.MaySetToNull
	private @Nullable IBinder mHostInputToken;		private @Nullable IBinder mHostInputToken;

	/**		/**
	@@ -498,7 +496,7 @@ public final class InlineSuggestionsRequest implements Parcelable {
	* The extras state propagated from the IME to pass extra data.		* The extras state propagated from the IME to pass extra data.
	*/		*/
	@DataClass.Generated.Member		@DataClass.Generated.Member
	public @NonNull Builder setExtras(@Nullable Bundle value) {		public @NonNull Builder setExtras(@NonNull Bundle value) {
	checkNotUsed();		checkNotUsed();
	mBuilderFieldsSet \|= 0x10;		mBuilderFieldsSet \|= 0x10;
	mExtras = value;		mExtras = value;
	@@ -513,7 +511,7 @@ public final class InlineSuggestionsRequest implements Parcelable {
	*/		*/
	@DataClass.Generated.Member		@DataClass.Generated.Member
	@Override		@Override
	@NonNull Builder setHostInputToken(@Nullable IBinder value) {		@NonNull Builder setHostInputToken(@NonNull IBinder value) {
	checkNotUsed();		checkNotUsed();
	mBuilderFieldsSet \|= 0x20;		mBuilderFieldsSet \|= 0x20;
	mHostInputToken = value;		mHostInputToken = value;
	@@ -578,10 +576,10 @@ public final class InlineSuggestionsRequest implements Parcelable {
	}		}

	@DataClass.Generated(		@DataClass.Generated(
	time = 1583975428858L,		time = 1584067152935L,
	codegenVersion = "1.0.15",		codegenVersion = "1.0.15",
	sourceFile = "frameworks/base/core/java/android/view/inputmethod/InlineSuggestionsRequest.java",		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.view.inline.InlinePresentationSpec> mPresentationSpecs\nprivate @android.annotation.NonNull java.lang.String mHostPackageName\nprivate @android.annotation.NonNull android.os.LocaleList mSupportedLocales\nprivate @com.android.internal.util.DataClass.MaySetToNull @android.annotation.Nullable android.os.Bundle mExtras\nprivate @com.android.internal.util.DataClass.MaySetToNull @android.annotation.Nullable android.os.IBinder mHostInputToken\nprivate int mHostDisplayId\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)\nabstract android.view.inputmethod.InlineSuggestionsRequest.Builder setPresentationSpecs(java.util.List<android.view.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.view.inline.InlinePresentationSpec> mPresentationSpecs\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 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)\nabstract android.view.inputmethod.InlineSuggestionsRequest.Builder setPresentationSpecs(java.util.List<android.view.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		@Deprecated
	private void __metadata() {}		private void __metadata() {}