Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5d8cbf8d: am d5884a9b: Merge change 21358 into donut

Browse Source 
Merge commit '5d8cbf8da3f44709bd9e64b10c037cdb543ffb17'

* commit '5d8cbf8da3f44709bd9e64b10c037cdb543ffb17':
  Unhide the broadcast intent that signals completion of the TTS language
This commit is contained in:
Jean-Michel Trivi
2009-08-18 12:09:20 -07:00
committed by Android Git Automerger
parent 5feac6c7eb 5d8cbf8da3
commit 748747f7ae
2 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
api/current.xml
View File

@@ -113994,6 +113994,17 @@
visibility="public"
>
</field>
<field name="ACTION_TTS_DATA_INSTALLED"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;android.speech.tts.engine.TTS_DATA_INSTALLED&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="CHECK_VOICE_DATA_BAD_DATA"
type="int"
transient="false"
@@ -114060,6 +114071,17 @@
visibility="public"
>
</field>
<field name="EXTRA_TTS_DATA_INSTALLED"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;dataInstalled&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="EXTRA_VOICE_DATA_FILES"
type="java.lang.String"
transient="false"

24
core/java/android/speech/tts/TextToSpeech.java
View File

@@ -61,7 +61,7 @@ public class TextToSpeech {
/**
* Denotes the language is available exactly as specified by the locale
* Denotes the language is available exactly as specified by the locale.
*/
public static final int LANG_COUNTRY_VAR_AVAILABLE = 2;
@@ -176,7 +176,7 @@ public class TextToSpeech {
// intents to ask engine to install data or check its data
/**
* Broadcast Action: Triggers the platform Text-To-Speech engine to
* Activity Action: Triggers the platform Text-To-Speech engine to
* start the activity that installs the resource files on the device
* that are required for TTS to be operational. Since the installation
* of the data can be interrupted or declined by the user, the application
@@ -184,18 +184,20 @@ public class TextToSpeech {
* and if need be, should check installation status with
* {@link #ACTION_CHECK_TTS_DATA}.
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
public static final String ACTION_INSTALL_TTS_DATA =
"android.speech.tts.engine.INSTALL_TTS_DATA";
/**
* {@hide}
* Broadcast Action: broadcast to signal the completion of the installation of
* the data files used by the synthesis engine. Success or failure is indicated in the
* {@link #EXTRA_TTS_DATA_INSTALLED} extra.
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_TTS_DATA_INSTALLED =
"android.speech.tts.engine.TTS_DATA_INSTALLED";
/**
* Broadcast Action: Starts the activity from the platform Text-To-Speech
* Activity Action: Starts the activity from the platform Text-To-Speech
* engine to verify the proper installation and availability of the
* resource files on the system. Upon completion, the activity will
* return one of the following codes:
@@ -217,7 +219,7 @@ public class TextToSpeech {
* and YYY is the 3-letter ISO country code.</li>
* </ul>
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
public static final String ACTION_CHECK_TTS_DATA =
"android.speech.tts.engine.CHECK_TTS_DATA";
@@ -241,11 +243,11 @@ public class TextToSpeech {
// extras for a TTS engine's data installation
/**
* Extra information received with the {@link #ACTION_TTS_DATA_INSTALLED} intent
* which indicates whether the TTS data installation requested with
* {@link #ACTION_INSTALL_TTS_DATA} completed successfully or not. The value is
* {@link TextToSpeech#SUCCESS} or {@link TextToSpeech#ERROR}.
* {@hide}
* Extra information received with the {@link #ACTION_TTS_DATA_INSTALLED} intent.
* It indicates whether the data files for the synthesis engine were successfully
* installed. The installation was initiated with the {@link #ACTION_INSTALL_TTS_DATA}
* intent. The possible values for this extra are
* {@link TextToSpeech#SUCCESS} and {@link TextToSpeech#ERROR}.
*/
public static final String EXTRA_TTS_DATA_INSTALLED = "dataInstalled";