diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-09 17:46:12 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-09 17:46:12 -0700 |
| commit | 3279fbad638bd48b8e52a528d75bb5aa4757f81c (patch) | |
| tree | 8f8a0d764efe78ee554d64eb60859b0d3fcd4b4d | |
| parent | 137c45036699eeceb061a47ab14d9a7eb860674d (diff) | |
| parent | f478267d6a60220fb8078c13971b5d4d3f868d67 (diff) | |
| download | frameworks_base-3279fbad638bd48b8e52a528d75bb5aa4757f81c.zip frameworks_base-3279fbad638bd48b8e52a528d75bb5aa4757f81c.tar.gz frameworks_base-3279fbad638bd48b8e52a528d75bb5aa4757f81c.tar.bz2 | |
Merge change 3652 into donut
* changes:
Adding default text-to-speech language in Settings.Secure.
| -rw-r--r-- | api/current.xml | 11 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 5 |
2 files changed, 16 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml index 8acad9f..d8212ef 100644 --- a/api/current.xml +++ b/api/current.xml @@ -107197,6 +107197,17 @@ visibility="public" > </field> +<field name="TTS_DEFAULT_LANG" + type="java.lang.String" + transient="false" + volatile="false" + value=""tts_default_lang"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="TTS_DEFAULT_PITCH" type="java.lang.String" transient="false" diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 42a5075..5f38316 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -1947,6 +1947,11 @@ public final class Settings { public static final String TTS_DEFAULT_SYNTH = "tts_default_synth"; /** + * Default text-to-speech language. + */ + public static final String TTS_DEFAULT_LANG = "tts_default_lang"; + + /** * Whether to notify the user of open networks. * <p> * If not connected and the scan results have an open network, we will |