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

Commit d0922047 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: I156df433e5e47061213caa273c3cbc7a7c5734e6
parents 390624e6 cc0987b1

core/api/current.txt

+0 −11
Original line number Diff line number Diff line
@@ -52877,18 +52877,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 {










@@ -52969,11 +52961,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;









@@ -52995,7 +52985,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);















  }







































core/api/removed.txt



+20
−0




























Original line number
Diff line number
Diff line








@@ -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 {

































core/api/system-current.txt



+0
−8




























Original line number
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 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 {










@@ -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 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);















  }







































core/api/system-removed.txt



+22
−0




























Original line number
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 {































  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);













  }



























}





































core/java/android/service/translation/TranslationService.java



+4
−5




























Original line number
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.













     * @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>















     *