Merge "Removed addValue from TranslationRequest because of potential bug in... (604ccc26) · Commits · e / os / android_frameworks_base

core/api/current.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -52890,8 +52890,8 @@ package android.view.translation {

	public static final class TranslationRequest.Builder {		public static final class TranslationRequest.Builder {
	ctor public TranslationRequest.Builder();		ctor public TranslationRequest.Builder();
	method @NonNull public android.view.translation.TranslationRequest.Builder addTranslationRequestValue(@NonNull android.view.translation.TranslationRequestValue);		method @Deprecated @NonNull public android.view.translation.TranslationRequest.Builder addTranslationRequestValue(@NonNull android.view.translation.TranslationRequestValue);
	method @NonNull public android.view.translation.TranslationRequest.Builder addViewTranslationRequest(@NonNull android.view.translation.ViewTranslationRequest);		method @Deprecated @NonNull public android.view.translation.TranslationRequest.Builder addViewTranslationRequest(@NonNull android.view.translation.ViewTranslationRequest);
	method @NonNull public android.view.translation.TranslationRequest build();		method @NonNull public android.view.translation.TranslationRequest build();
	method @NonNull public android.view.translation.TranslationRequest.Builder setFlags(int);		method @NonNull public android.view.translation.TranslationRequest.Builder setFlags(int);
	method @NonNull public android.view.translation.TranslationRequest.Builder setTranslationRequestValues(@NonNull java.util.List<android.view.translation.TranslationRequestValue>);		method @NonNull public android.view.translation.TranslationRequest.Builder setTranslationRequestValues(@NonNull java.util.List<android.view.translation.TranslationRequestValue>);

core/java/android/view/translation/TranslationRequest.java

+26 −5

Original line number	Original line	Diff line number	Diff line
	@@ -98,9 +98,26 @@ public final class TranslationRequest implements Parcelable {
	return Collections.emptyList();		return Collections.emptyList();
	}		}

			abstract static class BaseBuilder {
			/**
			* @deprecated use {@link Builder#setTranslationRequestValues(List)}.
			*/
			@Deprecated
			public abstract Builder addTranslationRequestValue(
			@NonNull TranslationRequestValue value);

			/**
			* @deprecated use {@link Builder#setViewTranslationRequests(List)}.
			*/
			@Deprecated
			public abstract Builder addViewTranslationRequest(
			@NonNull ViewTranslationRequest value);

			}


	// Code below generated by codegen v1.0.22.
			// Code below generated by codegen v1.0.23.
	//		//
	// DO NOT MODIFY!		// DO NOT MODIFY!
	// CHECKSTYLE:OFF Generated code		// CHECKSTYLE:OFF Generated code
	@@ -275,7 +292,7 @@ public final class TranslationRequest implements Parcelable {
	*/		*/
	@SuppressWarnings("WeakerAccess")		@SuppressWarnings("WeakerAccess")
	@DataClass.Generated.Member		@DataClass.Generated.Member
	public static final class Builder {		public static final class Builder extends BaseBuilder {

	private @RequestFlags int mFlags;		private @RequestFlags int mFlags;
	private @NonNull List<TranslationRequestValue> mTranslationRequestValues;		private @NonNull List<TranslationRequestValue> mTranslationRequestValues;
	@@ -312,6 +329,8 @@ public final class TranslationRequest implements Parcelable {

	/** @see #setTranslationRequestValues */		/** @see #setTranslationRequestValues */
	@DataClass.Generated.Member		@DataClass.Generated.Member
			@Override
			@Deprecated
	public @NonNull Builder addTranslationRequestValue(@NonNull TranslationRequestValue value) {		public @NonNull Builder addTranslationRequestValue(@NonNull TranslationRequestValue value) {
	if (mTranslationRequestValues == null) setTranslationRequestValues(new ArrayList<>());		if (mTranslationRequestValues == null) setTranslationRequestValues(new ArrayList<>());
	mTranslationRequestValues.add(value);		mTranslationRequestValues.add(value);
	@@ -333,6 +352,8 @@ public final class TranslationRequest implements Parcelable {

	/** @see #setViewTranslationRequests */		/** @see #setViewTranslationRequests */
	@DataClass.Generated.Member		@DataClass.Generated.Member
			@Override
			@Deprecated
	public @NonNull Builder addViewTranslationRequest(@NonNull ViewTranslationRequest value) {		public @NonNull Builder addViewTranslationRequest(@NonNull ViewTranslationRequest value) {
	if (mViewTranslationRequests == null) setViewTranslationRequests(new ArrayList<>());		if (mViewTranslationRequests == null) setViewTranslationRequests(new ArrayList<>());
	mViewTranslationRequests.add(value);		mViewTranslationRequests.add(value);
	@@ -369,10 +390,10 @@ public final class TranslationRequest implements Parcelable {
	}		}

	@DataClass.Generated(		@DataClass.Generated(
	time = 1614132376448L,		time = 1620429997487L,
	codegenVersion = "1.0.22",		codegenVersion = "1.0.23",
	sourceFile = "frameworks/base/core/java/android/view/translation/TranslationRequest.java",		sourceFile = "frameworks/base/core/java/android/view/translation/TranslationRequest.java",
	inputSignatures = "public static final @android.view.translation.TranslationRequest.RequestFlags int FLAG_TRANSLATION_RESULT\npublic static final @android.view.translation.TranslationRequest.RequestFlags int FLAG_DICTIONARY_RESULT\npublic static final @android.view.translation.TranslationRequest.RequestFlags int FLAG_TRANSLITERATION_RESULT\npublic static final @android.view.translation.TranslationRequest.RequestFlags int FLAG_PARTIAL_RESPONSES\nprivate final @android.view.translation.TranslationRequest.RequestFlags int mFlags\nprivate final @android.annotation.NonNull @com.android.internal.util.DataClass.PluralOf(\"translationRequestValue\") java.util.List<android.view.translation.TranslationRequestValue> mTranslationRequestValues\nprivate final @android.annotation.NonNull @com.android.internal.util.DataClass.PluralOf(\"viewTranslationRequest\") java.util.List<android.view.translation.ViewTranslationRequest> mViewTranslationRequests\nprivate static int defaultFlags()\nprivate static java.util.List<android.view.translation.TranslationRequestValue> defaultTranslationRequestValues()\nprivate static java.util.List<android.view.translation.ViewTranslationRequest> defaultViewTranslationRequests()\nclass TranslationRequest extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genToString=true, genHiddenConstDefs=true, genBuilder=true)")		inputSignatures = "public static final @android.view.translation.TranslationRequest.RequestFlags int FLAG_TRANSLATION_RESULT\npublic static final @android.view.translation.TranslationRequest.RequestFlags int FLAG_DICTIONARY_RESULT\npublic static final @android.view.translation.TranslationRequest.RequestFlags int FLAG_TRANSLITERATION_RESULT\npublic static final @android.view.translation.TranslationRequest.RequestFlags int FLAG_PARTIAL_RESPONSES\nprivate final @android.view.translation.TranslationRequest.RequestFlags int mFlags\nprivate final @android.annotation.NonNull @com.android.internal.util.DataClass.PluralOf(\"translationRequestValue\") java.util.List<android.view.translation.TranslationRequestValue> mTranslationRequestValues\nprivate final @android.annotation.NonNull @com.android.internal.util.DataClass.PluralOf(\"viewTranslationRequest\") java.util.List<android.view.translation.ViewTranslationRequest> mViewTranslationRequests\nprivate static int defaultFlags()\nprivate static java.util.List<android.view.translation.TranslationRequestValue> defaultTranslationRequestValues()\nprivate static java.util.List<android.view.translation.ViewTranslationRequest> defaultViewTranslationRequests()\nclass TranslationRequest extends java.lang.Object implements [android.os.Parcelable]\npublic abstract @java.lang.Deprecated android.view.translation.TranslationRequest.Builder addTranslationRequestValue(android.view.translation.TranslationRequestValue)\npublic abstract @java.lang.Deprecated android.view.translation.TranslationRequest.Builder addViewTranslationRequest(android.view.translation.ViewTranslationRequest)\nclass BaseBuilder extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genToString=true, genHiddenConstDefs=true, genBuilder=true)\npublic abstract @java.lang.Deprecated android.view.translation.TranslationRequest.Builder addTranslationRequestValue(android.view.translation.TranslationRequestValue)\npublic abstract @java.lang.Deprecated android.view.translation.TranslationRequest.Builder addViewTranslationRequest(android.view.translation.ViewTranslationRequest)\nclass BaseBuilder extends java.lang.Object implements []")
	@Deprecated		@Deprecated
	private void __metadata() {}		private void __metadata() {}