diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-19 14:43:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-19 14:43:37 -0700 |
| commit | 5254657540b0a6ad54be6229b68fa5626e4ef9e5 (patch) | |
| tree | 401d00a7e551088fb9fe27de4d2a007b3fbb83e7 | |
| parent | b4e456bf1823e2dd8c975ae02451b7b72541c236 (diff) | |
| parent | a6fcc9541161de5d1c39e62d2646076706d87b96 (diff) | |
| download | frameworks_base-5254657540b0a6ad54be6229b68fa5626e4ef9e5.zip frameworks_base-5254657540b0a6ad54be6229b68fa5626e4ef9e5.tar.gz frameworks_base-5254657540b0a6ad54be6229b68fa5626e4ef9e5.tar.bz2 | |
Merge change 4818 into donut
* changes:
Added in Settings.Secure default country and variant for the default TTS language.
| -rw-r--r-- | api/current.xml | 22 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 10 |
2 files changed, 32 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml index 962e8e6..6566191 100644 --- a/api/current.xml +++ b/api/current.xml @@ -105865,6 +105865,17 @@ visibility="public" > </field> +<field name="TTS_DEFAULT_COUNTRY" + type="java.lang.String" + transient="false" + volatile="false" + value=""tts_default_country"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="TTS_DEFAULT_LANG" type="java.lang.String" transient="false" @@ -105909,6 +105920,17 @@ visibility="public" > </field> +<field name="TTS_DEFAULT_VARIANT" + type="java.lang.String" + transient="false" + volatile="false" + value=""tts_default_variant"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="TTS_USE_DEFAULTS" type="java.lang.String" transient="false" diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 75fbb60..9246445 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -1960,6 +1960,16 @@ public final class Settings { public static final String TTS_DEFAULT_LANG = "tts_default_lang"; /** + * Default text-to-speech country. + */ + public static final String TTS_DEFAULT_COUNTRY = "tts_default_country"; + + /** + * Default text-to-speech locale variant. + */ + public static final String TTS_DEFAULT_VARIANT = "tts_default_variant"; + + /** * Whether to notify the user of open networks. * <p> * If not connected and the scan results have an open network, we will |