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

Commit 37537273 authored by Joanne Chung's avatar Joanne Chung Committed by Automerger Merge Worker
Browse files

Merge "Safe delete the deprecated APIs." into sc-dev am: afe90e57

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

Change-Id: I293b4d29eeb16ed025266e46da9a5e4824315488
parents 053ef8ad afe90e57
Loading
Loading
Loading
Loading
+0 −4
Original line number Original line Diff line number Diff line
@@ -14296,13 +14296,9 @@ package android.view.translation {
  }
  }
  public final class UiTranslationManager {
  public final class UiTranslationManager {
    method @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void finishTranslation(int);
    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 finishTranslation(@NonNull android.app.assist.ActivityId);
    method @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void pauseTranslation(int);
    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 pauseTranslation(@NonNull android.app.assist.ActivityId);
    method @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void resumeTranslation(int);
    method @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void resumeTranslation(@NonNull android.app.assist.ActivityId);
    method @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void resumeTranslation(@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>, int);
    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);
    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);
  }
  }
+11 −0
Original line number Original line Diff line number Diff line
@@ -181,3 +181,14 @@ package android.telephony.data {


}
}


package android.view.translation {

  public final class UiTranslationManager {
    method @Deprecated @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void finishTranslation(int);
    method @Deprecated @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void pauseTranslation(int);
    method @Deprecated @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void resumeTranslation(int);
    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>, int);
  }

}
+14 −4
Original line number Original line Diff line number Diff line
@@ -127,10 +127,13 @@ public final class UiTranslationManager {
     * @param destSpec {@link TranslationSpec} for the translated data.
     * @param destSpec {@link TranslationSpec} for the translated data.
     * @param viewIds A list of the {@link View}'s {@link AutofillId} which needs to be translated
     * @param viewIds A list of the {@link View}'s {@link AutofillId} which needs to be translated
     * @param taskId the Activity Task id which needs ui translation
     * @param taskId the Activity Task id which needs ui translation
     * @deprecated Use {@code startTranslation(TranslationSpec, TranslationSpec, List<AutofillId>,
     * ActivityId)} instead.
     *
     *
     * @hide
     * @hide
     * @removed
     */
     */
    // TODO, hide the APIs
    @Deprecated
    @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION)
    @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION)
    @SystemApi
    @SystemApi
    public void startTranslation(@NonNull TranslationSpec sourceSpec,
    public void startTranslation(@NonNull TranslationSpec sourceSpec,
@@ -193,10 +196,13 @@ public final class UiTranslationManager {
     * NOTE: Please use {@code finishTranslation(ActivityId)} instead.
     * NOTE: Please use {@code finishTranslation(ActivityId)} instead.
     *
     *
     * @param taskId the Activity Task id which needs ui translation
     * @param taskId the Activity Task id which needs ui translation
     * @deprecated Use {@code finishTranslation(ActivityId)} instead.
     *
     *
     * @hide
     * @hide
     * @removed
     *
     */
     */
    // TODO, hide the APIs
    @Deprecated
    @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION)
    @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION)
    @SystemApi
    @SystemApi
    public void finishTranslation(int taskId) {
    public void finishTranslation(int taskId) {
@@ -240,10 +246,12 @@ public final class UiTranslationManager {
     * NOTE: Please use {@code pauseTranslation(ActivityId)} instead.
     * NOTE: Please use {@code pauseTranslation(ActivityId)} instead.
     *
     *
     * @param taskId the Activity Task id which needs ui translation
     * @param taskId the Activity Task id which needs ui translation
     * @deprecated Use {@code pauseTranslation(ActivityId)} instead.
     *
     *
     * @hide
     * @hide
     * @removed
     */
     */
    // TODO, hide the APIs
    @Deprecated
    @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION)
    @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION)
    @SystemApi
    @SystemApi
    public void pauseTranslation(int taskId) {
    public void pauseTranslation(int taskId) {
@@ -287,10 +295,12 @@ public final class UiTranslationManager {
     * NOTE: Please use {@code resumeTranslation(ActivityId)} instead.
     * NOTE: Please use {@code resumeTranslation(ActivityId)} instead.
     *
     *
     * @param taskId the Activity Task id which needs ui translation
     * @param taskId the Activity Task id which needs ui translation
     * @deprecated Use {@code resumeTranslation(ActivityId)} instead.
     *
     *
     * @hide
     * @hide
     * @removed
     */
     */
    // TODO, hide the APIs
    @Deprecated
    @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION)
    @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION)
    @SystemApi
    @SystemApi
    public void resumeTranslation(int taskId) {
    public void resumeTranslation(int taskId) {