Merge change 4818 into donut

* changes:
  Added in Settings.Secure default country and variant for the default TTS language.

api/current.xml

@@ -105865,6 +105865,17 @@
  visibility="public"
 >
 </field>
+<field name="TTS_DEFAULT_COUNTRY"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;tts_default_country&quot;"
+ 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="&quot;tts_default_variant&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="TTS_USE_DEFAULTS"
  type="java.lang.String"
  transient="false"

core/java/android/provider/Settings.java

@@ -1959,6 +1959,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>