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

Commit 2ca6b8bd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Soft remove deprecated translation apis." into sc-dev am: cc0987b1

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

Change-Id: I7ba7833f0e988a1a31b55863e4319221c64be10d
parents 3a46f466 cc0987b1
Loading
Loading
Loading
Loading
+0 −11
Original line number Original line Diff line number Diff line
@@ -52869,18 +52869,10 @@ package android.view.translation {
  public final class TranslationManager {
  public final class TranslationManager {
    method public void addOnDeviceTranslationCapabilityUpdateListener(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.view.translation.TranslationCapability>);
    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 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 @NonNull @WorkerThread public java.util.Set<android.view.translation.TranslationCapability> getOnDeviceTranslationCapabilities(int, int);
    method @Nullable public android.app.PendingIntent getOnDeviceTranslationSettingsActivityIntent();
    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 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 {
  public final class TranslationRequest implements android.os.Parcelable {
@@ -52961,11 +52953,9 @@ package android.view.translation {
  }
  }
  public final class TranslationSpec implements android.os.Parcelable {
  public final class TranslationSpec implements android.os.Parcelable {
    ctor @Deprecated public TranslationSpec(@NonNull String, int);
    ctor public TranslationSpec(@NonNull android.icu.util.ULocale, int);
    ctor public TranslationSpec(@NonNull android.icu.util.ULocale, int);
    method public int describeContents();
    method public int describeContents();
    method public int getDataFormat();
    method public int getDataFormat();
    method @Deprecated @NonNull public String getLanguage();
    method @NonNull public android.icu.util.ULocale getLocale();
    method @NonNull public android.icu.util.ULocale getLocale();
    method public void writeToParcel(@NonNull android.os.Parcel, int);
    method public void writeToParcel(@NonNull android.os.Parcel, int);
    field @NonNull public static final android.os.Parcelable.Creator<android.view.translation.TranslationSpec> CREATOR;
    field @NonNull public static final android.os.Parcelable.Creator<android.view.translation.TranslationSpec> CREATOR;
@@ -52987,7 +52977,6 @@ package android.view.translation {
    method public void onFinished();
    method public void onFinished();
    method public void onPaused();
    method public void onPaused();
    method public default void onResumed(@NonNull android.icu.util.ULocale, @NonNull android.icu.util.ULocale);
    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);
    method public default void onStarted(@NonNull android.icu.util.ULocale, @NonNull android.icu.util.ULocale);
  }
  }
+20 −0
Original line number Original line Diff line number Diff line
@@ -549,10 +549,30 @@ package android.view {


package android.view.translation {
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 {
  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>);
    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 {
package android.webkit {
+0 −8
Original line number Original line Diff line number Diff line
@@ -10417,22 +10417,15 @@ package android.service.translation {
    method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);
    method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);
    method public void onConnected();
    method public void onConnected();
    method public void onCreateTranslationSession(@NonNull android.view.translation.TranslationContext, int, @NonNull java.util.function.Consumer<java.lang.Boolean>);
    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 void onDisconnected();
    method public abstract void onFinishTranslationSession(int);
    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 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 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);
    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_INTERFACE = "android.service.translation.TranslationService";
    field public static final String SERVICE_META_DATA = "android.translation_service";
    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 {
package android.service.trust {
@@ -14536,7 +14529,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 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 pauseTranslation(@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 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);
    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);
  }
  }
+22 −0
Original line number Original line Diff line number Diff line
@@ -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 {
package android.telecom {


  public class TelecomManager {
  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);
  }

}
+4 −5
Original line number Original line Diff line number Diff line
@@ -125,7 +125,7 @@ public abstract class TranslationService extends Service {


    /**
    /**
     * Interface definition for a callback to be invoked when the translation is compleled.
     * 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
    @Deprecated
    public interface OnTranslationResultCallback {
    public interface OnTranslationResultCallback {
@@ -149,7 +149,7 @@ public abstract class TranslationService extends Service {


        /**
        /**
         * TODO: implement javadoc
         * TODO: implement javadoc
         * @deprecated use {@link #onTranslationSuccess} with an error response instead.
         * @removed use {@link #onTranslationSuccess} with an error response instead.
         */
         */
        @Deprecated
        @Deprecated
        void onError();
        void onError();
@@ -240,7 +240,7 @@ public abstract class TranslationService extends Service {
    /**
    /**
     * TODO: fill in javadoc.
     * TODO: fill in javadoc.
     *
     *
     * @deprecated use {@link #onCreateTranslationSession(TranslationContext, int, Consumer)}
     * @removed use {@link #onCreateTranslationSession(TranslationContext, int, Consumer)}
     * instead.
     * instead.
     */
     */
    @Deprecated
    @Deprecated
@@ -263,7 +263,7 @@ public abstract class TranslationService extends Service {
     * @param sessionId
     * @param sessionId
     * @param callback
     * @param callback
     * @param cancellationSignal
     * @param cancellationSignal
     * @deprecated use
     * @removed use
     * {@link #onTranslationRequest(TranslationRequest, int, CancellationSignal, Consumer)} instead.
     * {@link #onTranslationRequest(TranslationRequest, int, CancellationSignal, Consumer)} instead.
     */
     */
    @Deprecated
    @Deprecated
@@ -305,7 +305,6 @@ public abstract class TranslationService extends Service {


    /**
    /**
     * TODO: fill in javadoc
     * 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>
     * <p>Must call {@code callback.accept} to pass back the set of translation capabilities.</p>
     *
     *
Loading