Unhiding TTS API constants and methods needed for TTS plugin support.
This is a fix for bug #2548048
Change-Id: Ieb60979098c1d2e82618204882bd523d271a8784
diff --git a/api/current.xml b/api/current.xml
index a4aeb85..0d42c2c 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -138932,6 +138932,28 @@
<parameter name="filename" type="java.lang.String">
</parameter>
</method>
+<method name="areDefaultsEnforced"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
+<method name="getDefaultEngine"
+ return="java.lang.String"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
<method name="getLanguage"
return="java.util.Locale"
abstract="false"
@@ -139348,6 +139370,28 @@
visibility="public"
>
</field>
+<field name="EXTRA_AVAILABLE_VOICES"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value=""availableVoices""
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="EXTRA_CHECK_VOICE_DATA_FOR"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value=""checkVoiceDataFor""
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="EXTRA_TTS_DATA_INSTALLED"
type="java.lang.String"
transient="false"
@@ -139359,6 +139403,17 @@
visibility="public"
>
</field>
+<field name="EXTRA_UNAVAILABLE_VOICES"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value=""unavailableVoices""
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="EXTRA_VOICE_DATA_FILES"
type="java.lang.String"
transient="false"
diff --git a/core/java/android/speech/tts/TextToSpeech.java b/core/java/android/speech/tts/TextToSpeech.java
index e7c6432..26c167e 100755
--- a/core/java/android/speech/tts/TextToSpeech.java
+++ b/core/java/android/speech/tts/TextToSpeech.java
@@ -261,7 +261,6 @@
* the TextToSpeech engine returns an ArrayList<String> of all the available voices.
* The format of each voice is: lang-COUNTRY-variant where COUNTRY and variant are
* optional (ie, "eng" or "eng-USA" or "eng-USA-FEMALE").
- * {@hide}
*/
public static final String EXTRA_AVAILABLE_VOICES = "availableVoices";
/**
@@ -269,7 +268,6 @@
* the TextToSpeech engine returns an ArrayList<String> of all the unavailable voices.
* The format of each voice is: lang-COUNTRY-variant where COUNTRY and variant are
* optional (ie, "eng" or "eng-USA" or "eng-USA-FEMALE").
- * {@hide}
*/
public static final String EXTRA_UNAVAILABLE_VOICES = "unavailableVoices";
/**
@@ -278,7 +276,6 @@
* check for by sending an ArrayList<String> of the voices that are of interest.
* The format of each voice is: lang-COUNTRY-variant where COUNTRY and variant are
* optional (ie, "eng" or "eng-USA" or "eng-USA-FEMALE").
- * {@hide}
*/
public static final String EXTRA_CHECK_VOICE_DATA_FOR = "checkVoiceDataFor";
@@ -1375,8 +1372,6 @@
* Gets the packagename of the default speech synthesis engine.
*
* @return Packagename of the TTS engine that the user has chosen as their default.
- *
- * @hide
*/
public String getDefaultEngine() {
synchronized (mStartLock) {
@@ -1416,8 +1411,6 @@
* Text-To-Speech settings set by applications.
*
* @return Whether or not defaults are enforced.
- *
- * @hide
*/
public boolean areDefaultsEnforced() {
synchronized (mStartLock) {