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

Commit 250dc1a8 authored by Nick Kralevich's avatar Nick Kralevich Committed by Android (Google) Code Review
Browse files

Merge "fix javadocs."

parents 9748fe9a eb337054

core/java/android/speech/tts/RequestConfig.java

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ import android.os.Bundle; 
 * Synthesis request configuration.

 *

 * This class is immutable, and can only be constructed using

 * @link{RequestConfig.Builder}.

 * {@link RequestConfig.Builder}.

 */

public final class RequestConfig {
@@ -54,12 +54,12 @@ public final class RequestConfig { 
         *

         * @param paramName

         *            The name of the parameter. It has to be one of the keys

         *            from @{link VoiceInfo.getParamsWithDefaults()}

         *            from {@link VoiceInfo#getParamsWithDefaults()}

         * @param value

         *            Value of the parameter. Its type can be one of: Integer, Float,

         *            Boolean, String, VoiceInfo (will be set as an Integer, result of a call to

         *            the {@link VoiceInfo#getId()}) or byte[]. It has to be of the same type

         *            as the default value from @{link VoiceInfo.getParamsWithDefaults()}

         *            as the default value from {@link VoiceInfo#getParamsWithDefaults()}

         *            for that parameter.

         * @throws IllegalArgumentException

         *            If paramName is not a valid parameter name or its value is of a wrong

core/java/android/speech/tts/SynthesisCallback.java

+3 −3
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ public interface SynthesisCallback { 
     * {@link TextToSpeechService#onSynthesizeTextV2}.

     *

     * @param errorCode Error code to pass to the client. One of the ERROR_ values from

     *      @{link android.sppech.tts.v2.TextToSpeechClient.Status}

     *      {@link TextToSpeechClient.Status}

     */

    public void error(int errorCode);
@@ -132,7 +132,7 @@ public interface SynthesisCallback { 
    public int fallback();



    /**

     * Check if @{link #start} was called or not.

     * Check if {@link #start} was called or not.

     *

     * This method should only be called on the synthesis thread,

     * while in {@link TextToSpeechService#onSynthesizeText} or
@@ -143,7 +143,7 @@ public interface SynthesisCallback { 
    public boolean hasStarted();



    /**

     * Check if @{link #done} was called or not.

     * Check if {@link #done} was called or not.

     *

     * This method should only be called on the synthesis thread,

     * while in {@link TextToSpeechService#onSynthesizeText} or

core/java/android/speech/tts/TextToSpeech.java

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ import java.util.Set; 
 * When you are done using the TextToSpeech instance, call the {@link #shutdown()} method

 * to release the native resources used by the TextToSpeech engine.

 *

 * @deprecated Use @{link android.speech.tts.v2.TextToSpeechClient} instead

 * @deprecated Use {@link TextToSpeechClient} instead

 */

@Deprecated

public class TextToSpeech {

core/java/android/speech/tts/TextToSpeechClient.java

+1 −1
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ public final class TextToSpeechClient { 
    }



    /**

     * Retrieve TTS engine status @{link VoicesStatus}. Requires connected client.

     * Retrieve TTS engine status {@link EngineStatus}. Requires connected client.

     */

    public EngineStatus getEngineStatus() {

        synchronized (mLock) {