am 928e48f2: Merge "Fix bug 2084122: enable application control over text synth volume" into honeycomb

* commit '928e48f2bae9816fb5b3f1444f8ca9a4de15d8c3':
  Fix bug 2084122: enable application control over text synth volume
This commit is contained in:
Jean-Michel Trivi
2011-01-19 09:14:57 -08:00
committed by Android Git Automerger
2 changed files with 24 additions and 4 deletions

View File

@@ -177170,6 +177170,17 @@
visibility="public"
>
</field>
<field name="KEY_PARAM_PAN"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;pan&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="KEY_PARAM_STREAM"
type="java.lang.String"
transient="false"
@@ -177192,6 +177203,17 @@
visibility="public"
>
</field>
<field name="KEY_PARAM_VOLUME"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;volume&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
</class>
<interface name="TextToSpeech.OnInitListener"
abstract="true"

View File

@@ -349,19 +349,17 @@ public class TextToSpeech {
*/
public static final String KEY_PARAM_UTTERANCE_ID = "utteranceId";
/**
* {@hide}
* Parameter key to specify the speech volume relative to the current stream type
* volume used when speaking text. Volume is specified as a float ranging from 0 to 1
* where 0 is silence, and 1 is the maximum volume.
* where 0 is silence, and 1 is the maximum volume (the default behavior).
* @see TextToSpeech#speak(String, int, HashMap)
* @see TextToSpeech#playEarcon(String, int, HashMap)
*/
public static final String KEY_PARAM_VOLUME = "volume";
/**
* {@hide}
* Parameter key to specify how the speech is panned from left to right when speaking text.
* Pan is specified as a float ranging from -1 to +1 where -1 maps to a hard-left pan,
* 0 to center, and +1 to hard-right.
* 0 to center (the default behavior), and +1 to hard-right.
* @see TextToSpeech#speak(String, int, HashMap)
* @see TextToSpeech#playEarcon(String, int, HashMap)
*/