Merge "Fix bug 2084122: enable application control over text synth volume" into honeycomb (928e48f2) · Commits · e / os / android_frameworks_base

api/current.xml

+22 −0

Original line number	Original line	Diff line number	Diff line
	@@ -175707,6 +175707,17 @@
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
			<field name="KEY_PARAM_PAN"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""pan""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
	<field name="KEY_PARAM_STREAM"		<field name="KEY_PARAM_STREAM"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	@@ -175729,6 +175740,17 @@
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
			<field name="KEY_PARAM_VOLUME"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""volume""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
	</class>		</class>
	<interface name="TextToSpeech.OnInitListener"		<interface name="TextToSpeech.OnInitListener"
	abstract="true"		abstract="true"

core/java/android/speech/tts/TextToSpeech.java

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -349,19 +349,17 @@ public class TextToSpeech {
	*/		*/
	public static final String KEY_PARAM_UTTERANCE_ID = "utteranceId";		public static final String KEY_PARAM_UTTERANCE_ID = "utteranceId";
	/**		/**
	* {@hide}
	* Parameter key to specify the speech volume relative to the current stream type		* 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		* 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#speak(String, int, HashMap)
	* @see TextToSpeech#playEarcon(String, int, HashMap)		* @see TextToSpeech#playEarcon(String, int, HashMap)
	*/		*/
	public static final String KEY_PARAM_VOLUME = "volume";		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.		* 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,		* 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#speak(String, int, HashMap)
	* @see TextToSpeech#playEarcon(String, int, HashMap)		* @see TextToSpeech#playEarcon(String, int, HashMap)
	*/		*/