Soft remove deprecated translation apis.

Bug: 186475868
Test: atest CtsTranslationTestCases
Change-Id: I87395052e9e5574f4ba11652c484cedec95c0cfb

13 files changed, 77 insertions, 48 deletions

diff --git a/core/api/current.txt b/core/api/current.txt
index f1241df85e41..a7ba3e229ba2 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -52860,18 +52860,10 @@ package android.view.translation {
 
   public final class TranslationManager {
     method public void addOnDeviceTranslationCapabilityUpdateListener(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.view.translation.TranslationCapability>);
-    method @Deprecated public void addOnDeviceTranslationCapabilityUpdateListener(int, int, @NonNull android.app.PendingIntent);
-    method @Deprecated public void addTranslationCapabilityUpdateListener(int, int, @NonNull android.app.PendingIntent);
     method public void createOnDeviceTranslator(@NonNull android.view.translation.TranslationContext, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.view.translation.Translator>);
-    method @Deprecated @Nullable @WorkerThread public android.view.translation.Translator createOnDeviceTranslator(@NonNull android.view.translation.TranslationContext);
-    method @Deprecated @Nullable @WorkerThread public android.view.translation.Translator createTranslator(@NonNull android.view.translation.TranslationContext);
     method @NonNull @WorkerThread public java.util.Set<android.view.translation.TranslationCapability> getOnDeviceTranslationCapabilities(int, int);
     method @Nullable public android.app.PendingIntent getOnDeviceTranslationSettingsActivityIntent();
-    method @Deprecated @NonNull @WorkerThread public java.util.Set<android.view.translation.TranslationCapability> getTranslationCapabilities(int, int);
-    method @Deprecated @Nullable public android.app.PendingIntent getTranslationSettingsActivityIntent();
     method public void removeOnDeviceTranslationCapabilityUpdateListener(@NonNull java.util.function.Consumer<android.view.translation.TranslationCapability>);
-    method @Deprecated public void removeOnDeviceTranslationCapabilityUpdateListener(int, int, @NonNull android.app.PendingIntent);
-    method @Deprecated public void removeTranslationCapabilityUpdateListener(int, int, @NonNull android.app.PendingIntent);
   }
 
   public final class TranslationRequest implements android.os.Parcelable {
@@ -52952,11 +52944,9 @@ package android.view.translation {
   }
 
   public final class TranslationSpec implements android.os.Parcelable {
-    ctor @Deprecated public TranslationSpec(@NonNull String, int);
     ctor public TranslationSpec(@NonNull android.icu.util.ULocale, int);
     method public int describeContents();
     method public int getDataFormat();
-    method @Deprecated @NonNull public String getLanguage();
     method @NonNull public android.icu.util.ULocale getLocale();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.view.translation.TranslationSpec> CREATOR;
@@ -52978,7 +52968,6 @@ package android.view.translation {
     method public void onFinished();
     method public void onPaused();
     method public default void onResumed(@NonNull android.icu.util.ULocale, @NonNull android.icu.util.ULocale);
-    method @Deprecated public default void onStarted(@NonNull String, @NonNull String);
     method public default void onStarted(@NonNull android.icu.util.ULocale, @NonNull android.icu.util.ULocale);
   }
 
diff --git a/core/api/removed.txt b/core/api/removed.txt
index 8229019ab664..cdb6a5814217 100644
--- a/core/api/removed.txt
+++ b/core/api/removed.txt
@@ -549,10 +549,30 @@ package android.view {
 
 package android.view.translation {
 
+  public final class TranslationManager {
+    method @Deprecated public void addOnDeviceTranslationCapabilityUpdateListener(int, int, @NonNull android.app.PendingIntent);
+    method @Deprecated public void addTranslationCapabilityUpdateListener(int, int, @NonNull android.app.PendingIntent);
+    method @Deprecated @Nullable @WorkerThread public android.view.translation.Translator createOnDeviceTranslator(@NonNull android.view.translation.TranslationContext);
+    method @Deprecated @Nullable @WorkerThread public android.view.translation.Translator createTranslator(@NonNull android.view.translation.TranslationContext);
+    method @Deprecated @NonNull @WorkerThread public java.util.Set<android.view.translation.TranslationCapability> getTranslationCapabilities(int, int);
+    method @Deprecated @Nullable public android.app.PendingIntent getTranslationSettingsActivityIntent();
+    method @Deprecated public void removeOnDeviceTranslationCapabilityUpdateListener(int, int, @NonNull android.app.PendingIntent);
+    method @Deprecated public void removeTranslationCapabilityUpdateListener(int, int, @NonNull android.app.PendingIntent);
+  }
+
+  public final class TranslationSpec implements android.os.Parcelable {
+    ctor @Deprecated public TranslationSpec(@NonNull String, int);
+    method @Deprecated @NonNull public String getLanguage();
+  }
+
   public class Translator {
     method @Deprecated @Nullable public void translate(@NonNull android.view.translation.TranslationRequest, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.view.translation.TranslationResponse>);
   }
 
+  public interface UiTranslationStateCallback {
+    method @Deprecated public default void onStarted(@NonNull String, @NonNull String);
+  }
+
 }
 
 package android.webkit {
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 95d91197f5b7..4e905c079e9b 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -10410,22 +10410,15 @@ package android.service.translation {
     method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);
     method public void onConnected();
     method public void onCreateTranslationSession(@NonNull android.view.translation.TranslationContext, int, @NonNull java.util.function.Consumer<java.lang.Boolean>);
-    method @Deprecated public void onCreateTranslationSession(@NonNull android.view.translation.TranslationContext, int);
     method public void onDisconnected();
     method public abstract void onFinishTranslationSession(int);
     method public abstract void onTranslationCapabilitiesRequest(int, int, @NonNull java.util.function.Consumer<java.util.Set<android.view.translation.TranslationCapability>>);
-    method @Deprecated public void onTranslationRequest(@NonNull android.view.translation.TranslationRequest, int, @Nullable android.os.CancellationSignal, @NonNull android.service.translation.TranslationService.OnTranslationResultCallback);
     method public void onTranslationRequest(@NonNull android.view.translation.TranslationRequest, int, @Nullable android.os.CancellationSignal, @NonNull java.util.function.Consumer<android.view.translation.TranslationResponse>);
     method public final void updateTranslationCapability(@NonNull android.view.translation.TranslationCapability);
     field public static final String SERVICE_INTERFACE = "android.service.translation.TranslationService";
     field public static final String SERVICE_META_DATA = "android.translation_service";
   }
 
-  @Deprecated public static interface TranslationService.OnTranslationResultCallback {
-    method @Deprecated public void onError();
-    method @Deprecated public void onTranslationSuccess(@NonNull android.view.translation.TranslationResponse);
-  }
-
 }
 
 package android.service.trust {
@@ -14529,7 +14522,6 @@ package android.view.translation {
     method @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void finishTranslation(@NonNull android.app.assist.ActivityId);
     method @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void pauseTranslation(@NonNull android.app.assist.ActivityId);
     method @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void resumeTranslation(@NonNull android.app.assist.ActivityId);
-    method @Deprecated @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void startTranslation(@NonNull android.view.translation.TranslationSpec, @NonNull android.view.translation.TranslationSpec, @NonNull java.util.List<android.view.autofill.AutofillId>, @NonNull android.app.assist.ActivityId);
     method @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void startTranslation(@NonNull android.view.translation.TranslationSpec, @NonNull android.view.translation.TranslationSpec, @NonNull java.util.List<android.view.autofill.AutofillId>, @NonNull android.app.assist.ActivityId, @NonNull android.view.translation.UiTranslationSpec);
   }
 
diff --git a/core/api/system-removed.txt b/core/api/system-removed.txt
index 65a87808b7b1..304f4fe1df33 100644
--- a/core/api/system-removed.txt
+++ b/core/api/system-removed.txt
@@ -183,6 +183,20 @@ package android.service.search {
 
 }
 
+package android.service.translation {
+
+  public abstract class TranslationService extends android.app.Service {
+    method @Deprecated public void onCreateTranslationSession(@NonNull android.view.translation.TranslationContext, int);
+    method @Deprecated public void onTranslationRequest(@NonNull android.view.translation.TranslationRequest, int, @Nullable android.os.CancellationSignal, @NonNull android.service.translation.TranslationService.OnTranslationResultCallback);
+  }
+
+  @Deprecated public static interface TranslationService.OnTranslationResultCallback {
+    method @Deprecated public void onError();
+    method public void onTranslationSuccess(@NonNull android.view.translation.TranslationResponse);
+  }
+
+}
+
 package android.telecom {
 
   public class TelecomManager {
@@ -209,3 +223,11 @@ package android.telephony.data {
 
 }
 
+package android.view.translation {
+
+  public final class UiTranslationManager {
+    method @Deprecated @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void startTranslation(@NonNull android.view.translation.TranslationSpec, @NonNull android.view.translation.TranslationSpec, @NonNull java.util.List<android.view.autofill.AutofillId>, @NonNull android.app.assist.ActivityId);
+  }
+
+}
+
diff --git a/core/java/android/service/translation/TranslationService.java b/core/java/android/service/translation/TranslationService.java
index 24ebe454f728..2f704f46ab74 100644
--- a/core/java/android/service/translation/TranslationService.java
+++ b/core/java/android/service/translation/TranslationService.java
@@ -125,7 +125,7 @@ public abstract class TranslationService extends Service {
 
     /**
      * Interface definition for a callback to be invoked when the translation is compleled.
-     * @deprecated use a {@link Consumer} instead.
+     * @removed use a {@link Consumer} instead.
      */
     @Deprecated
     public interface OnTranslationResultCallback {
@@ -149,7 +149,7 @@ public abstract class TranslationService extends Service {
 
         /**
          * TODO: implement javadoc
-         * @deprecated use {@link #onTranslationSuccess} with an error response instead.
+         * @removed use {@link #onTranslationSuccess} with an error response instead.
          */
         @Deprecated
         void onError();
@@ -240,7 +240,7 @@ public abstract class TranslationService extends Service {
     /**
      * TODO: fill in javadoc.
      *
-     * @deprecated use {@link #onCreateTranslationSession(TranslationContext, int, Consumer)}
+     * @removed use {@link #onCreateTranslationSession(TranslationContext, int, Consumer)}
      * instead.
      */
     @Deprecated
@@ -263,7 +263,7 @@ public abstract class TranslationService extends Service {
      * @param sessionId
      * @param callback
      * @param cancellationSignal
-     * @deprecated use
+     * @removed use
      * {@link #onTranslationRequest(TranslationRequest, int, CancellationSignal, Consumer)} instead.
      */
     @Deprecated
@@ -305,7 +305,6 @@ public abstract class TranslationService extends Service {
 
     /**
      * TODO: fill in javadoc
-     * TODO: make this abstract again once aiai is ready.
      *
      * <p>Must call {@code callback.accept} to pass back the set of translation capabilities.</p>
      *
diff --git a/core/java/android/view/translation/TranslationCapability.java b/core/java/android/view/translation/TranslationCapability.java
index 0bea1212e3e2..d104b2427c8e 100644
--- a/core/java/android/view/translation/TranslationCapability.java
+++ b/core/java/android/view/translation/TranslationCapability.java
@@ -26,12 +26,15 @@ import com.android.internal.util.DataClass;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Objects;
+import java.util.concurrent.Executor;
+import java.util.function.Consumer;
 
 /**
  * Capability class holding information for a pair of {@link TranslationSpec}s.
  *
  * <p>Holds information and limitations on how to create a {@link TranslationContext} which can
- * be used by {@link TranslationManager#createTranslator(TranslationContext)}.
+ * be used by
+ * {@link TranslationManager#createOnDeviceTranslator(TranslationContext, Executor, Consumer)}.
  */
 @DataClass(genHiddenConstDefs = true, genToString = true, genConstructor = false)
 public final class TranslationCapability implements Parcelable {
@@ -290,7 +293,7 @@ public final class TranslationCapability implements Parcelable {
     };
 
     @DataClass.Generated(
-            time = 1619119609557L,
+            time = 1621545303074L,
             codegenVersion = "1.0.23",
             sourceFile = "frameworks/base/core/java/android/view/translation/TranslationCapability.java",
             inputSignatures = "public static final @android.view.translation.TranslationCapability.ModelState int STATE_AVAILABLE_TO_DOWNLOAD\npublic static final @android.view.translation.TranslationCapability.ModelState int STATE_DOWNLOADING\npublic static final @android.view.translation.TranslationCapability.ModelState int STATE_ON_DEVICE\npublic static final @android.view.translation.TranslationCapability.ModelState int STATE_NOT_AVAILABLE\nprivate final @android.view.translation.TranslationCapability.ModelState int mState\nprivate final @android.annotation.NonNull android.view.translation.TranslationSpec mSourceSpec\nprivate final @android.annotation.NonNull android.view.translation.TranslationSpec mTargetSpec\nprivate final  boolean mUiTranslationEnabled\nprivate final @android.view.translation.TranslationContext.TranslationFlag int mSupportedTranslationFlags\nclass TranslationCapability extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genHiddenConstDefs=true, genToString=true, genConstructor=false)")
diff --git a/core/java/android/view/translation/TranslationContext.java b/core/java/android/view/translation/TranslationContext.java
index 2a5dedd01f20..210fe320faf5 100644
--- a/core/java/android/view/translation/TranslationContext.java
+++ b/core/java/android/view/translation/TranslationContext.java
@@ -21,9 +21,12 @@ import android.os.Parcelable;
 
 import com.android.internal.util.DataClass;
 
+import java.util.concurrent.Executor;
+import java.util.function.Consumer;
+
 /**
  * Info class holding information for {@link Translator}s and used by
- * {@link TranslationManager#createTranslator(TranslationContext)}.
+ * {@link TranslationManager#createOnDeviceTranslator(TranslationContext, Executor, Consumer)}.
  */
 @DataClass(genHiddenConstDefs = true, genToString = true, genBuilder = true)
 public final class TranslationContext implements Parcelable {
@@ -295,7 +298,7 @@ public final class TranslationContext implements Parcelable {
     }
 
     @DataClass.Generated(
-            time = 1621034221152L,
+            time = 1621545292157L,
             codegenVersion = "1.0.23",
             sourceFile = "frameworks/base/core/java/android/view/translation/TranslationContext.java",
             inputSignatures = "public static final @android.view.translation.TranslationContext.TranslationFlag int FLAG_LOW_LATENCY\npublic static final @android.view.translation.TranslationContext.TranslationFlag int FLAG_TRANSLITERATION\npublic static final @android.view.translation.TranslationContext.TranslationFlag int FLAG_DEFINITIONS\nprivate final @android.annotation.NonNull android.view.translation.TranslationSpec mSourceSpec\nprivate final @android.annotation.NonNull android.view.translation.TranslationSpec mTargetSpec\nprivate final @android.view.translation.TranslationContext.TranslationFlag int mTranslationFlags\nprivate static  int defaultTranslationFlags()\nclass TranslationContext extends java.lang.Object implements [android.os.Parcelable]\nclass BaseBuilder extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genHiddenConstDefs=true, genToString=true, genBuilder=true)\nclass BaseBuilder extends java.lang.Object implements []")
diff --git a/core/java/android/view/translation/TranslationManager.java b/core/java/android/view/translation/TranslationManager.java
index 20d817db02b3..aec53206402b 100644
--- a/core/java/android/view/translation/TranslationManager.java
+++ b/core/java/android/view/translation/TranslationManager.java
@@ -186,7 +186,7 @@ public final class TranslationManager {
      *
      * <p><strong>NOTE: </strong>Call on a worker thread.
      *
-     * @deprecated use {@link #createOnDeviceTranslator(TranslationContext, Executor, Consumer)}
+     * @removed use {@link #createOnDeviceTranslator(TranslationContext, Executor, Consumer)}
      * instead.
      *
      * @param translationContext {@link TranslationContext} containing the specs for creating the
@@ -230,7 +230,7 @@ public final class TranslationManager {
         }
     }
 
-    /** @deprecated Use {@link #createOnDeviceTranslator(TranslationContext)} */
+    /** @removed Use {@link #createOnDeviceTranslator(TranslationContext)} */
     @Deprecated
     @Nullable
     @WorkerThread
@@ -245,8 +245,9 @@ public final class TranslationManager {
      * <p>These translation capabilities contains a source and target {@link TranslationSpec}
      * representing the data expected for both ends of translation process. The capabilities
      * provides the information and limitations for generating a {@link TranslationContext}.
-     * The context object can then be used by {@link #createTranslator(TranslationContext)} to
-     * obtain a {@link Translator} for translations.</p>
+     * The context object can then be used by
+     * {@link #createOnDeviceTranslator(TranslationContext, Executor, Consumer)} to obtain a
+     * {@link Translator} for translations.</p>
      *
      * <p><strong>NOTE: </strong>Call on a worker thread.
      *
@@ -284,7 +285,7 @@ public final class TranslationManager {
         }
     }
 
-    /** @deprecated Use {@link #getOnDeviceTranslationCapabilities(int, int)} */
+    /** @removed Use {@link #getOnDeviceTranslationCapabilities(int, int)} */
     @Deprecated
     @NonNull
     @WorkerThread
@@ -327,7 +328,7 @@ public final class TranslationManager {
 
 
     /**
-     * @deprecated Use {@link TranslationManager#addOnDeviceTranslationCapabilityUpdateListener(
+     * @removed Use {@link TranslationManager#addOnDeviceTranslationCapabilityUpdateListener(
      * java.util.concurrent.Executor, java.util.function.Consumer)}
      */
     @Deprecated
@@ -345,7 +346,7 @@ public final class TranslationManager {
     }
 
     /**
-     * @deprecated Use {@link TranslationManager#addOnDeviceTranslationCapabilityUpdateListener(
+     * @removed Use {@link TranslationManager#addOnDeviceTranslationCapabilityUpdateListener(
      * java.util.concurrent.Executor, java.util.function.Consumer)}
      */
     @Deprecated
@@ -384,7 +385,7 @@ public final class TranslationManager {
     }
 
     /**
-     * @deprecated Use {@link #removeOnDeviceTranslationCapabilityUpdateListener(
+     * @removed Use {@link #removeOnDeviceTranslationCapabilityUpdateListener(
      * java.util.function.Consumer)}.
      */
     @Deprecated
@@ -413,7 +414,7 @@ public final class TranslationManager {
     }
 
     /**
-     * @deprecated Use {@link #removeOnDeviceTranslationCapabilityUpdateListener(
+     * @removed Use {@link #removeOnDeviceTranslationCapabilityUpdateListener(
      * java.util.function.Consumer)}.
      */
     @Deprecated
@@ -451,7 +452,7 @@ public final class TranslationManager {
         }
     }
 
-    /** @deprecated Use {@link #getOnDeviceTranslationSettingsActivityIntent()} */
+    /** @removed Use {@link #getOnDeviceTranslationSettingsActivityIntent()} */
     @Deprecated
     @Nullable
     public PendingIntent getTranslationSettingsActivityIntent() {
diff --git a/core/java/android/view/translation/TranslationRequest.java b/core/java/android/view/translation/TranslationRequest.java
index 7082e2b8193c..da1baf9a89d8 100644
--- a/core/java/android/view/translation/TranslationRequest.java
+++ b/core/java/android/view/translation/TranslationRequest.java
@@ -100,14 +100,14 @@ public final class TranslationRequest implements Parcelable {
 
     abstract static class BaseBuilder {
         /**
-         * @deprecated use {@link Builder#setTranslationRequestValues(List)}.
+         * @removed use {@link Builder#setTranslationRequestValues(List)}.
          */
         @Deprecated
         public abstract Builder addTranslationRequestValue(
                 @NonNull TranslationRequestValue value);
 
         /**
-         * @deprecated use {@link Builder#setViewTranslationRequests(List)}.
+         * @removed use {@link Builder#setViewTranslationRequests(List)}.
          */
         @Deprecated
         public abstract Builder addViewTranslationRequest(
diff --git a/core/java/android/view/translation/TranslationResponse.java b/core/java/android/view/translation/TranslationResponse.java
index eef283d7a6db..7d23e1976837 100644
--- a/core/java/android/view/translation/TranslationResponse.java
+++ b/core/java/android/view/translation/TranslationResponse.java
@@ -78,7 +78,7 @@ public final class TranslationResponse implements Parcelable {
     abstract static class BaseBuilder {
 
         /**
-         * @deprecated Use {@link Builder#Builder(int)}.
+         * @removed Use {@link Builder#Builder(int)}.
          * @hide
          */
         @Deprecated
@@ -447,7 +447,7 @@ public final class TranslationResponse implements Parcelable {
     }
 
     @DataClass.Generated(
-            time = 1617218030666L,
+            time = 1620089618357L,
             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 []")
diff --git a/core/java/android/view/translation/TranslationSpec.java b/core/java/android/view/translation/TranslationSpec.java
index 4d2ea494b303..efc3d8ba8096 100644
--- a/core/java/android/view/translation/TranslationSpec.java
+++ b/core/java/android/view/translation/TranslationSpec.java
@@ -47,7 +47,7 @@ public final class TranslationSpec implements Parcelable {
     public @interface DataFormat {}
 
     /**
-     * @deprecated use {@code mLocale} instead.
+     * @removed use {@code mLocale} instead.
      */
     @Deprecated
     private final @NonNull String mLanguage;
@@ -68,7 +68,7 @@ public final class TranslationSpec implements Parcelable {
     }
 
     /**
-     * @deprecated use {@link #TranslationSpec(ULocale, int)} instead.
+     * @removed use {@link #TranslationSpec(ULocale, int)} instead.
      */
     @Deprecated
     public TranslationSpec(@NonNull String language, @DataFormat int dataFormat) {
@@ -106,7 +106,7 @@ public final class TranslationSpec implements Parcelable {
 
 
     /**
-     * @deprecated use {@code mLocale} instead.
+     * @removed use {@code mLocale} instead.
      */
     @DataClass.Generated.Member
     public @Deprecated @NonNull String getLanguage() {
@@ -226,7 +226,7 @@ public final class TranslationSpec implements Parcelable {
     };
 
     @DataClass.Generated(
-            time = 1618968175733L,
+            time = 1620089623334L,
             codegenVersion = "1.0.23",
             sourceFile = "frameworks/base/core/java/android/view/translation/TranslationSpec.java",
             inputSignatures = "public static final  int DATA_FORMAT_TEXT\nprivate final @java.lang.Deprecated @android.annotation.NonNull java.lang.String mLanguage\nprivate final @android.annotation.NonNull android.icu.util.ULocale mLocale\nprivate final @android.view.translation.TranslationSpec.DataFormat int mDataFormat\n  void parcelLocale(android.os.Parcel,int)\nstatic  android.icu.util.ULocale unparcelLocale(android.os.Parcel)\nclass TranslationSpec extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genHiddenConstDefs=true, genToString=true, genConstructor=false)")
diff --git a/core/java/android/view/translation/UiTranslationManager.java b/core/java/android/view/translation/UiTranslationManager.java
index 882833d20e3c..3350c9310823 100644
--- a/core/java/android/view/translation/UiTranslationManager.java
+++ b/core/java/android/view/translation/UiTranslationManager.java
@@ -119,7 +119,7 @@ public final class UiTranslationManager {
     }
 
     /**
-     * @deprecated Use {@link #startTranslation(TranslationSpec, TranslationSpec, List, ActivityId,
+     * @removed Use {@link #startTranslation(TranslationSpec, TranslationSpec, List, ActivityId,
      * UiTranslationSpec)} instead.
      *
      * @hide
diff --git a/core/java/android/view/translation/UiTranslationStateCallback.java b/core/java/android/view/translation/UiTranslationStateCallback.java
index 9aa089d1e1bc..d7dc284a2a09 100644
--- a/core/java/android/view/translation/UiTranslationStateCallback.java
+++ b/core/java/android/view/translation/UiTranslationStateCallback.java
@@ -28,7 +28,7 @@ import java.util.concurrent.Executor;
 public interface UiTranslationStateCallback {
 
     /**
-     * @deprecated use {@link #onStarted(ULocale, ULocale)} instead.
+     * @removed use {@link #onStarted(ULocale, ULocale)} instead.
      */
     @Deprecated
     default void onStarted(@NonNull String sourceLocale, @NonNull String targetLocale) {