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

Commit 2653f23d authored by Adam He's avatar Adam He Committed by Joanne Chung
Browse files

Initial layout of translation related APIs. 

The initial translation related APIs. The APIs and the implementation
will be revised in the follow up changes. The service register will
on the next changes.

Bug: 173243538
Bug: 176208267
Test: manual verification (build)

Change-Id: Ib7b39e1b548bc6663a81482fa335632e8da18d6a
parent 31f217fa

core/api/current.txt

+61 −0
Original line number Original line Diff line number Diff line
@@ -12325,6 +12325,7 @@ package android.content.pm { 
    field public static final String FEATURE_TOUCHSCREEN_MULTITOUCH = "android.hardware.touchscreen.multitouch";

    field public static final String FEATURE_TOUCHSCREEN_MULTITOUCH = "android.hardware.touchscreen.multitouch";

    field public static final String FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT = "android.hardware.touchscreen.multitouch.distinct";

    field public static final String FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT = "android.hardware.touchscreen.multitouch.distinct";

    field public static final String FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND = "android.hardware.touchscreen.multitouch.jazzhand";

    field public static final String FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND = "android.hardware.touchscreen.multitouch.jazzhand";

    field public static final String FEATURE_TRANSLATION = "android.software.translation";

    field public static final String FEATURE_USB_ACCESSORY = "android.hardware.usb.accessory";

    field public static final String FEATURE_USB_ACCESSORY = "android.hardware.usb.accessory";

    field public static final String FEATURE_USB_HOST = "android.hardware.usb.host";

    field public static final String FEATURE_USB_HOST = "android.hardware.usb.host";

    field public static final String FEATURE_VERIFIED_BOOT = "android.software.verified_boot";

    field public static final String FEATURE_VERIFIED_BOOT = "android.software.verified_boot";
@@ -51524,6 +51525,66 @@ package android.view.textservice { 
















}







}






























package android.view.translation {



























  public final class TranslationManager {














    method @Nullable @WorkerThread public android.view.translation.Translator createTranslator(@NonNull android.view.translation.TranslationSpec, @NonNull android.view.translation.TranslationSpec);














    method @NonNull @WorkerThread public java.util.List<java.lang.String> getSupportedLocales();














  }



























  public final class TranslationRequest implements android.os.Parcelable {














    ctor public TranslationRequest(@Nullable CharSequence);














    method public int describeContents();














    method @Nullable public android.view.autofill.AutofillId getAutofillId();














    method @Nullable public CharSequence getTranslationText();














    method public void writeToParcel(@NonNull android.os.Parcel, int);














    field @NonNull public static final android.os.Parcelable.Creator<android.view.translation.TranslationRequest> CREATOR;














  }



























  public static final class TranslationRequest.Builder {














    ctor public TranslationRequest.Builder();














    method @NonNull public android.view.translation.TranslationRequest build();














    method @NonNull public android.view.translation.TranslationRequest.Builder setAutofillId(@NonNull android.view.autofill.AutofillId);














    method @NonNull public android.view.translation.TranslationRequest.Builder setTranslationText(@NonNull CharSequence);














  }



























  public final class TranslationResponse implements android.os.Parcelable {














    method public int describeContents();














    method public int getTranslationStatus();














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














    method public void writeToParcel(@NonNull android.os.Parcel, int);














    field @NonNull public static final android.os.Parcelable.Creator<android.view.translation.TranslationResponse> CREATOR;














    field public static final int TRANSLATION_STATUS_LANGUAGE_UNAVAILABLE = 2; // 0x2














    field public static final int TRANSLATION_STATUS_SUCCESS = 0; // 0x0














    field public static final int TRANSLATION_STATUS_UNKNOWN_ERROR = 1; // 0x1














  }



























  public static final class TranslationResponse.Builder {














    ctor public TranslationResponse.Builder(int);














    method @NonNull public android.view.translation.TranslationResponse.Builder addTranslations(@NonNull android.view.translation.TranslationRequest);














    method @NonNull public android.view.translation.TranslationResponse build();














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














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














  }



























  public final class TranslationSpec implements android.os.Parcelable {














    ctor public TranslationSpec(@NonNull String, int);














    method public int describeContents();














    method public int getDataFormat();














    method @NonNull public String getLanguage();














    method public void writeToParcel(@NonNull android.os.Parcel, int);














    field @NonNull public static final android.os.Parcelable.Creator<android.view.translation.TranslationSpec> CREATOR;














    field public static final int DATA_FORMAT_TEXT = 1; // 0x1














  }



























  public class Translator {














    method public void destroy();














    method public boolean isDestroyed();














    method @Nullable @WorkerThread public android.view.translation.TranslationResponse translate(@NonNull android.view.translation.TranslationRequest);














  }



























}
























package android.webkit {







package android.webkit {



























  public abstract class ClientCertRequest {







  public abstract class ClientCertRequest {

























core/api/system-current.txt



+44
−0




























Original line number
Original line
Diff line number
Diff line








@@ -52,6 +52,7 @@ package android {









    field public static final String BIND_TELEPHONY_NETWORK_SERVICE = "android.permission.BIND_TELEPHONY_NETWORK_SERVICE";







    field public static final String BIND_TELEPHONY_NETWORK_SERVICE = "android.permission.BIND_TELEPHONY_NETWORK_SERVICE";











    field public static final String BIND_TEXTCLASSIFIER_SERVICE = "android.permission.BIND_TEXTCLASSIFIER_SERVICE";







    field public static final String BIND_TEXTCLASSIFIER_SERVICE = "android.permission.BIND_TEXTCLASSIFIER_SERVICE";











    field public static final String BIND_TIME_ZONE_PROVIDER_SERVICE = "android.permission.BIND_TIME_ZONE_PROVIDER_SERVICE";







    field public static final String BIND_TIME_ZONE_PROVIDER_SERVICE = "android.permission.BIND_TIME_ZONE_PROVIDER_SERVICE";














    field public static final String BIND_TRANSLATION_SERVICE = "android.permission.BIND_TRANSLATION_SERVICE";











    field public static final String BIND_TRUST_AGENT = "android.permission.BIND_TRUST_AGENT";







    field public static final String BIND_TRUST_AGENT = "android.permission.BIND_TRUST_AGENT";











    field public static final String BIND_TV_REMOTE_SERVICE = "android.permission.BIND_TV_REMOTE_SERVICE";







    field public static final String BIND_TV_REMOTE_SERVICE = "android.permission.BIND_TV_REMOTE_SERVICE";











    field public static final String BRICK = "android.permission.BRICK";







    field public static final String BRICK = "android.permission.BRICK";










@@ -1935,6 +1936,7 @@ package android.content {









    field public static final String SYSTEM_CONFIG_SERVICE = "system_config";







    field public static final String SYSTEM_CONFIG_SERVICE = "system_config";











    field public static final String SYSTEM_UPDATE_SERVICE = "system_update";







    field public static final String SYSTEM_UPDATE_SERVICE = "system_update";











    field public static final String TETHERING_SERVICE = "tethering";







    field public static final String TETHERING_SERVICE = "tethering";














    field public static final String TRANSLATION_MANAGER_SERVICE = "transformer";











    field public static final String VR_SERVICE = "vrmanager";







    field public static final String VR_SERVICE = "vrmanager";











    field public static final String WIFI_NL80211_SERVICE = "wifinl80211";







    field public static final String WIFI_NL80211_SERVICE = "wifinl80211";











    field @Deprecated public static final String WIFI_RTT_SERVICE = "rttmanager";







    field @Deprecated public static final String WIFI_RTT_SERVICE = "rttmanager";










@@ -9795,6 +9797,48 @@ package android.service.timezone {

























}







}






























package android.service.translation {



























  public final class TranslationRequest implements android.os.Parcelable {














    ctor public TranslationRequest(int, @NonNull android.view.translation.TranslationSpec, @NonNull android.view.translation.TranslationSpec, @NonNull java.util.List<android.view.translation.TranslationRequest>);














    method public int describeContents();














    method @NonNull public android.view.translation.TranslationSpec getDestSpec();














    method public int getRequestId();














    method @NonNull public android.view.translation.TranslationSpec getSourceSpec();














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














    method public void writeToParcel(@NonNull android.os.Parcel, int);














    field @NonNull public static final android.os.Parcelable.Creator<android.service.translation.TranslationRequest> CREATOR;














  }



























  public static final class TranslationRequest.Builder {














    ctor public TranslationRequest.Builder(int, @NonNull android.view.translation.TranslationSpec, @NonNull android.view.translation.TranslationSpec, @NonNull java.util.List<android.view.translation.TranslationRequest>);














    method @NonNull public android.service.translation.TranslationRequest.Builder addTranslationRequests(@NonNull android.view.translation.TranslationRequest);














    method @NonNull public android.service.translation.TranslationRequest build();














    method @NonNull public android.service.translation.TranslationRequest.Builder setDestSpec(@NonNull android.view.translation.TranslationSpec);














    method @NonNull public android.service.translation.TranslationRequest.Builder setRequestId(int);














    method @NonNull public android.service.translation.TranslationRequest.Builder setSourceSpec(@NonNull android.view.translation.TranslationSpec);














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














  }



























  public abstract class TranslationService extends android.app.Service {














    ctor public TranslationService();














    method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);














    method public void onConnected();














    method public abstract void onCreateTranslationSession(@NonNull android.view.translation.TranslationSpec, @NonNull android.view.translation.TranslationSpec, int);














    method public void onDisconnected();














    method public abstract void onFinishTranslationSession(int);














    method public abstract void onTranslationRequest(@NonNull android.service.translation.TranslationRequest, int, @NonNull android.os.CancellationSignal, @NonNull android.service.translation.TranslationService.OnTranslationResultCallback);














    field public static final String SERVICE_INTERFACE = "android.service.translation.TranslationService";














    field public static final String SERVICE_META_DATA = "android.translation_service";














  }



























  public static interface TranslationService.OnTranslationResultCallback {














    method public void onError();














    method public void onTranslationSuccess(@NonNull android.view.translation.TranslationResponse);














  }



























}
























package android.service.trust {







package android.service.trust {



























  public class TrustAgentService extends android.app.Service {







  public class TrustAgentService extends android.app.Service {

























core/java/android/content/Context.java



+11
−0




























Original line number
Original line
Diff line number
Diff line








@@ -4507,6 +4507,17 @@ public abstract class Context {









    @SuppressLint("ServiceName")  // TODO: This should be renamed to CONTENT_CAPTURE_SERVICE







    @SuppressLint("ServiceName")  // TODO: This should be renamed to CONTENT_CAPTURE_SERVICE











    public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture";







    public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture";


































    /**














     * Official published name of the translation service.














     *














     * @hide














     * @see #getSystemService(String)














     */














    // TODO(b/176208267): change it back to translation before S release.














    @SystemApi














    @SuppressLint("ServiceName")














    public static final String TRANSLATION_MANAGER_SERVICE = "transformer";


























    /**







    /**











     * Used for getting content selections and classifications for task snapshots.







     * Used for getting content selections and classifications for task snapshots.











     *







     *

































core/java/android/content/pm/PackageManager.java



+8
−0




























Original line number
Original line
Diff line number
Diff line








@@ -3404,6 +3404,14 @@ public abstract class PackageManager {









    @SdkConstant(SdkConstantType.FEATURE)







    @SdkConstant(SdkConstantType.FEATURE)











    public static final String FEATURE_AUTOFILL = "android.software.autofill";







    public static final String FEATURE_AUTOFILL = "android.software.autofill";


































    /**














     * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}:














     * The device supports translation of text-to-text in multiple languages via integration with














     * the system {@link android.service.translation.TranslationService translation provider}.














     */














    @SdkConstant(SdkConstantType.FEATURE)














    public static final String FEATURE_TRANSLATION = "android.software.translation";


























    /**







    /**











     * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}:







     * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}:











     * The device implements headtracking suitable for a VR device.







     * The device implements headtracking suitable for a VR device.

































core/java/android/service/translation/ITranslationCallback.aidl
0 → 100644



+29
−0




























Original line number
Original line
Diff line number
Diff line














/*














 * Copyright (C) 2020 The Android Open Source Project














 *














 * Licensed under the Apache License, Version 2.0 (the "License");














 * you may not use this file except in compliance with the License.














 * You may obtain a copy of the License at














 *














 *      http://www.apache.org/licenses/LICENSE-2.0














 *














 * Unless required by applicable law or agreed to in writing, software














 * distributed under the License is distributed on an "AS IS" BASIS,














 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.














 * See the License for the specific language governing permissions and














 * limitations under the License.














 */





























package android.service.translation;





























import android.view.translation.TranslationResponse;





























/**














 * Interface to receive the result of a {@code TranslationRequest}.














 *














 * @hide














 */














oneway interface ITranslationCallback {














    void onTranslationComplete(in TranslationResponse translationResponse);














    void onError();














}