In the TTS settings: rely on the default locale rather than default
values stored in TextToSpeech.Engine to initialize the default TTS
country and variant.
diff --git a/src/com/android/settings/TextToSpeechSettings.java b/src/com/android/settings/TextToSpeechSettings.java
index 11998a3..88bfc67 100644
--- a/src/com/android/settings/TextToSpeechSettings.java
+++ b/src/com/android/settings/TextToSpeechSettings.java
@@ -191,8 +191,9 @@
country = Settings.Secure.getString(resolver, KEY_TTS_DEFAULT_COUNTRY);
if (country == null) {
// default country setting not found, initialize it, as well as the variant;
- country = TextToSpeech.Engine.FALLBACK_TTS_DEFAULT_COUNTRY;
- variant = TextToSpeech.Engine.FALLBACK_TTS_DEFAULT_VARIANT;
+ Locale currentLocale = Locale.getDefault();
+ country = currentLocale.getISO3Country();
+ variant = currentLocale.getVariant();
Settings.Secure.putString(resolver, TTS_DEFAULT_COUNTRY, country);
Settings.Secure.putString(resolver, TTS_DEFAULT_VARIANT, variant);
}
@@ -203,7 +204,8 @@
variant = Settings.Secure.getString(resolver, KEY_TTS_DEFAULT_VARIANT);
if (variant == null) {
// default variant setting not found, initialize it
- variant = TextToSpeech.Engine.FALLBACK_TTS_DEFAULT_VARIANT;
+ Locale currentLocale = Locale.getDefault();
+ variant = currentLocale.getVariant();
Settings.Secure.putString(resolver, TTS_DEFAULT_VARIANT, variant);
}
}