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

resolved conflicts for merge of 5158cc55 to master

Browse Source
This commit is contained in:
Charles Chen
2009-06-24 16:54:35 -07:00
parent afed82bca9 5158cc5508
commit 69866cea4d
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/content/Intent.java
View File

@@ -1593,6 +1593,15 @@ public class Intent implements Parcelable {
public static final String ACTION_REMOTE_INTENT =
"android.intent.action.REMOTE_INTENT";
/**
* @hide
* TODO: This will be unhidden in a later CL.
* Broadcast Action: The TextToSpeech synthesizer has completed processing
* all of the text in the speech queue.
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_TTS_QUEUE_PROCESSING_COMPLETED =
"android.intent.action.TTS_QUEUE_PROCESSING_COMPLETED";
// ---------------------------------------------------------------------
// ---------------------------------------------------------------------