diff options
| -rw-r--r-- | api/current.txt | 5 | ||||
| -rw-r--r-- | core/java/android/speech/tts/TextToSpeech.java | 11 | ||||
| -rw-r--r-- | core/java/android/speech/tts/TextToSpeechService.java | 2 | ||||
| -rw-r--r-- | core/java/android/speech/tts/Voice.java | 9 |
4 files changed, 7 insertions, 20 deletions
diff --git a/api/current.txt b/api/current.txt index 877d5ae86c70..8c62747afea8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -27282,7 +27282,7 @@ package android.speech.tts { method public boolean isSpeaking(); method public int playEarcon(java.lang.String, int, android.os.Bundle, java.lang.String); method public deprecated int playEarcon(java.lang.String, int, java.util.HashMap<java.lang.String, java.lang.String>); - method public int playSilence(long, int, java.util.HashMap<java.lang.String, java.lang.String>, java.lang.String); + method public int playSilence(long, int, java.lang.String); method public deprecated int playSilence(long, int, java.util.HashMap<java.lang.String, java.lang.String>); method public int setAudioAttributes(android.media.AudioAttributes); method public deprecated int setEngineByPackageName(java.lang.String); @@ -27370,7 +27370,7 @@ package android.speech.tts { public abstract class TextToSpeechService extends android.app.Service { ctor public TextToSpeechService(); method public android.os.IBinder onBind(android.content.Intent); - method protected java.lang.String onGetDefaultVoiceNameFor(java.lang.String, java.lang.String, java.lang.String); + method public java.lang.String onGetDefaultVoiceNameFor(java.lang.String, java.lang.String, java.lang.String); method protected java.util.Set<java.lang.String> onGetFeaturesForLanguage(java.lang.String, java.lang.String, java.lang.String); method protected abstract java.lang.String[] onGetLanguage(); method public java.util.List<android.speech.tts.Voice> onGetVoices(); @@ -27400,6 +27400,7 @@ package android.speech.tts { method public int getQuality(); method public boolean isNetworkConnectionRequired(); method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator CREATOR; field public static final int LATENCY_HIGH = 400; // 0x190 field public static final int LATENCY_LOW = 200; // 0xc8 field public static final int LATENCY_NORMAL = 300; // 0x12c diff --git a/core/java/android/speech/tts/TextToSpeech.java b/core/java/android/speech/tts/TextToSpeech.java index 9be220e89618..120c9e37b792 100644 --- a/core/java/android/speech/tts/TextToSpeech.java +++ b/core/java/android/speech/tts/TextToSpeech.java @@ -1216,17 +1216,12 @@ public class TextToSpeech { * * @param durationInMs The duration of the silence. * @param queueMode {@link #QUEUE_ADD} or {@link #QUEUE_FLUSH}. - * @param params Parameters for the request. Can be null. - * Engine specific parameters may be passed in but the parameter keys - * must be prefixed by the name of the engine they are intended for. For example - * the keys "com.svox.pico_foo" and "com.svox.pico:bar" will be passed to the - * engine named "com.svox.pico" if it is being used. * @param utteranceId An unique identifier for this request. * * @return {@link #ERROR} or {@link #SUCCESS} of <b>queuing</b> the playSilence operation. */ public int playSilence(final long durationInMs, final int queueMode, - final HashMap<String, String> params, final String utteranceId) { + final String utteranceId) { return runAction(new Action<Integer>() { @Override public Integer run(ITextToSpeechService service) throws RemoteException { @@ -1258,12 +1253,12 @@ public class TextToSpeech { * * @return {@link #ERROR} or {@link #SUCCESS} of <b>queuing</b> the playSilence operation. * @deprecated As of API level 20, replaced by - * {@link #playSilence(long, int, HashMap, String)}. + * {@link #playSilence(long, int, String)}. */ @Deprecated public int playSilence(final long durationInMs, final int queueMode, final HashMap<String, String> params) { - return playSilence(durationInMs, queueMode, params, + return playSilence(durationInMs, queueMode, params == null ? null : params.get(Engine.KEY_PARAM_UTTERANCE_ID)); } diff --git a/core/java/android/speech/tts/TextToSpeechService.java b/core/java/android/speech/tts/TextToSpeechService.java index d00a433ac65f..079467a9e529 100644 --- a/core/java/android/speech/tts/TextToSpeechService.java +++ b/core/java/android/speech/tts/TextToSpeechService.java @@ -317,7 +317,7 @@ public abstract class TextToSpeechService extends Service { * @return A name of the default voice for a given locale. */ - protected String onGetDefaultVoiceNameFor(String lang, String country, String variant) { + public String onGetDefaultVoiceNameFor(String lang, String country, String variant) { int localeStatus = onIsLanguageAvailable(lang, country, variant); Locale iso3Locale = null; switch (localeStatus) { diff --git a/core/java/android/speech/tts/Voice.java b/core/java/android/speech/tts/Voice.java index a1fa51d1901e..dcf598014fdb 100644 --- a/core/java/android/speech/tts/Voice.java +++ b/core/java/android/speech/tts/Voice.java @@ -91,9 +91,6 @@ public class Voice implements Parcelable { Collections.addAll(this.mFeatures, in.readStringArray()); } - /** - * @hide - */ @Override public void writeToParcel(Parcel dest, int flags) { dest.writeString(mName); @@ -104,17 +101,11 @@ public class Voice implements Parcelable { dest.writeStringList(new ArrayList<String>(mFeatures)); } - /** - * @hide - */ @Override public int describeContents() { return 0; } - /** - * @hide - */ public static final Parcelable.Creator<Voice> CREATOR = new Parcelable.Creator<Voice>() { @Override public Voice createFromParcel(Parcel in) { |