Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec95ec05 authored by Ahaan Ugale's avatar Ahaan Ugale Committed by Automerger Merge Worker
Browse files

Merge "Manual overwrite @removed for genereated builder apis." into sc-dev am:... 

Merge "Manual overwrite @removed for genereated builder apis." into sc-dev am: c449e23d am: ab5c58b5 am: 598fe132

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14722632

Change-Id: I4bd202929763009ebf656bacc5323b1aedb74870
parents d2c689cb 598fe132

core/api/current.txt

+0 −3
Original line number Diff line number Diff line
@@ -52906,8 +52906,6 @@ package android.view.translation { 














  public static final class TranslationRequest.Builder {















    ctor public TranslationRequest.Builder();













    method @Deprecated @NonNull public android.view.translation.TranslationRequest.Builder addTranslationRequestValue(@NonNull android.view.translation.TranslationRequestValue);













    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.Builder setFlags(int);















    method @NonNull public android.view.translation.TranslationRequest.Builder setTranslationRequestValues(@NonNull java.util.List<android.view.translation.TranslationRequestValue>);










@@ -52941,7 +52939,6 @@ package android.view.translation {













    method @NonNull public android.view.translation.TranslationResponse.Builder setFinalResponse(boolean);















    method @NonNull public android.view.translation.TranslationResponse.Builder setTranslationResponseValue(int, @NonNull android.view.translation.TranslationResponseValue);















    method @NonNull public android.view.translation.TranslationResponse.Builder setTranslationResponseValues(@NonNull android.util.SparseArray<android.view.translation.TranslationResponseValue>);













    method @Deprecated @NonNull public android.view.translation.TranslationResponse.Builder setTranslationStatus(int);















    method @NonNull public android.view.translation.TranslationResponse.Builder setViewTranslationResponse(int, @NonNull android.view.translation.ViewTranslationResponse);















    method @NonNull public android.view.translation.TranslationResponse.Builder setViewTranslationResponses(@NonNull android.util.SparseArray<android.view.translation.ViewTranslationResponse>);















  }

























core/api/removed.txt



+9
−0




























Original line number
Diff line number
Diff line








@@ -560,6 +560,15 @@ package android.view.translation {













    method @Deprecated public void removeTranslationCapabilityUpdateListener(int, int, @NonNull android.app.PendingIntent);















  }





























  public static final class TranslationRequest.Builder {













    method @Deprecated @NonNull public android.view.translation.TranslationRequest.Builder addTranslationRequestValue(@NonNull android.view.translation.TranslationRequestValue);













    method @Deprecated @NonNull public android.view.translation.TranslationRequest.Builder addViewTranslationRequest(@NonNull android.view.translation.ViewTranslationRequest);













  }



























  public static final class TranslationResponse.Builder {













    method @Deprecated @NonNull public android.view.translation.TranslationResponse.Builder setTranslationStatus(int);













  }





























  public final class TranslationSpec implements android.os.Parcelable {















    ctor @Deprecated public TranslationSpec(@NonNull String, int);















    method @Deprecated @NonNull public String getLanguage();

































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



+6
−2




























Original line number
Diff line number
Diff line








@@ -327,7 +327,9 @@ public final class TranslationRequest implements Parcelable {













            return this;















        }





























        /** @see #setTranslationRequestValues */













        /** @see #setTranslationRequestValues













         * @removed













         */















        @DataClass.Generated.Member















        @Override















        @Deprecated









@@ -350,7 +352,9 @@ public final class TranslationRequest implements Parcelable {













            return this;















        }





























        /** @see #setViewTranslationRequests */













        /** @see #setViewTranslationRequests













         * @removed













         */















        @DataClass.Generated.Member















        @Override















        @Deprecated

































core/java/android/view/translation/TranslationResponse.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -367,6 +367,7 @@ public final class TranslationResponse implements Parcelable {





























        /**















         * The translation result status code.













         * @removed















         */















        @DataClass.Generated.Member















        @Override










@@ -447,7 +448,7 @@ public final class TranslationResponse implements Parcelable {













    }































    @DataClass.Generated(













            time = 1620089618357L,













            time = 1621972659130L,















            codegenVersion = "1.0.23",















            sourceFile = "frameworks/base/core/java/android/view/translation/TranslationResponse.java",















            inputSignatures = "public static final  int TRANSLATION_STATUS_SUCCESS\npublic static final  int TRANSLATION_STATUS_UNKNOWN_ERROR\npublic static final  int TRANSLATION_STATUS_CONTEXT_UNSUPPORTED\nprivate final @android.view.translation.TranslationResponse.TranslationStatus int mTranslationStatus\nprivate final @android.annotation.NonNull android.util.SparseArray<android.view.translation.TranslationResponseValue> mTranslationResponseValues\nprivate final @android.annotation.NonNull android.util.SparseArray<android.view.translation.ViewTranslationResponse> mViewTranslationResponses\nprivate final  boolean mFinalResponse\nprivate static  android.util.SparseArray<android.view.translation.TranslationResponseValue> defaultTranslationResponseValues()\nprivate static  android.util.SparseArray<android.view.translation.ViewTranslationResponse> defaultViewTranslationResponses()\nprivate static  boolean defaultFinalResponse()\nclass TranslationResponse extends java.lang.Object implements [android.os.Parcelable]\npublic abstract @java.lang.Deprecated android.view.translation.TranslationResponse.Builder setTranslationStatus(int)\npublic @android.annotation.NonNull @java.lang.SuppressWarnings android.view.translation.TranslationResponse.Builder setTranslationResponseValue(int,android.view.translation.TranslationResponseValue)\npublic @android.annotation.NonNull @java.lang.SuppressWarnings android.view.translation.TranslationResponse.Builder setViewTranslationResponse(int,android.view.translation.ViewTranslationResponse)\nclass BaseBuilder extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genBuilder=true, genToString=true, genHiddenConstDefs=true)\npublic abstract @java.lang.Deprecated android.view.translation.TranslationResponse.Builder setTranslationStatus(int)\npublic @android.annotation.NonNull @java.lang.SuppressWarnings android.view.translation.TranslationResponse.Builder setTranslationResponseValue(int,android.view.translation.TranslationResponseValue)\npublic @android.annotation.NonNull @java.lang.SuppressWarnings android.view.translation.TranslationResponse.Builder setViewTranslationResponse(int,android.view.translation.ViewTranslationResponse)\nclass BaseBuilder extends java.lang.Object implements []")