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

Commit 16184dc0 authored by Anton Hansson's avatar Anton Hansson Committed by Gerrit Code Review
Browse files

Merge "Fix broken documentation in view.translation" into main

parents ffc2dafd 2a8febfe
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ public final class TranslationCapability implements Parcelable {

    /**
     * Translation flags for settings that are supported by the
     * {@link android.service.translation.TranslationService} between the {@link TranslationSpec}s
     * translation service between the {@link TranslationSpec}s
     * provided in this capability.
     */
    @DataClass.Generated.Member
+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ import java.util.function.Consumer;
 * translation framework.
 *
 * <p>The TranslationManager manages {@link Translator}s and help bridge client calls to
 * the server {@link android.service.translation.TranslationService} </p>
 * the server translation service </p>
 */
@SystemService(Context.TRANSLATION_MANAGER_SERVICE)
public final class TranslationManager {
+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import java.util.Collections;
import java.util.List;

/**
 * Translation request sent to the {@link android.service.translation.TranslationService} by the
 * Translation request sent to the translation service by the
 * {@link android.view.translation.Translator} which contains the text to be translated.
 */
@DataClass(genToString = true, genHiddenConstDefs = true, genBuilder = true)
+3 −4
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.annotation.IntDef;
import android.annotation.NonNull;
import android.os.Parcel;
import android.os.Parcelable;
import android.service.translation.TranslationService;
import android.util.SparseArray;

import com.android.internal.util.DataClass;
@@ -30,17 +29,17 @@ import java.lang.annotation.RetentionPolicy;
import java.util.Objects;

/**
 * Response from the {@link TranslationService}, which contains the translated result.
 * Response from the translation service, which contains the translated result.
 */
@DataClass(genBuilder = true, genToString = true, genHiddenConstDefs = true)
public final class TranslationResponse implements Parcelable {

    /**
     * The {@link TranslationService} was successful in translating.
     * The translation service was successful in translating.
     */
    public static final int TRANSLATION_STATUS_SUCCESS = 0;
    /**
     * The {@link TranslationService} returned unknown translation result.
     * The translation service returned unknown translation result.
     */
    public static final int TRANSLATION_STATUS_UNKNOWN_ERROR = 1;
    /**
+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import com.android.internal.util.DataClass;
import java.util.Objects;

/**
 * A translated response value from {@link android.service.translation.TranslationService}.
 * A translated response value from translation service.
 */
@DataClass(genBuilder = true, genToString = true, genEqualsHashCode = true,
        genHiddenConstDefs = true)
Loading