Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 6314 into donut

Browse Source 
* changes:
  Use the current Locale as the default language when TTS settings are not found, rather than a hardcoded value stored in TextToSpeech.Engine.
This commit is contained in:
Android (Google) Code Review
2009-07-07 10:35:40 -07:00
parent fa6c7111fe d478cf09df
commit b61479ae86
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/TtsService/src/android/tts/TtsService.java
View File

@@ -36,6 +36,7 @@ import android.util.Log;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
/** /**
@@ -183,7 +184,8 @@ public class TtsService extends Service implements OnCompletionListener {
String defaultLang = android.provider.Settings.Secure.getString(mResolver, String defaultLang = android.provider.Settings.Secure.getString(mResolver,
android.provider.Settings.Secure.TTS_DEFAULT_LANG); android.provider.Settings.Secure.TTS_DEFAULT_LANG);
if (defaultLang == null) { if (defaultLang == null) {
return TextToSpeech.Engine.FALLBACK_TTS_DEFAULT_LANG; // no setting found, use the current Locale to determine the default language
return Locale.getDefault().getISO3Language();
} else { } else {
return defaultLang; return defaultLang;
} }
@@ -194,7 +196,8 @@ public class TtsService extends Service implements OnCompletionListener {
String defaultCountry = android.provider.Settings.Secure.getString(mResolver, String defaultCountry = android.provider.Settings.Secure.getString(mResolver,
android.provider.Settings.Secure.TTS_DEFAULT_COUNTRY); android.provider.Settings.Secure.TTS_DEFAULT_COUNTRY);
if (defaultCountry == null) { if (defaultCountry == null) {
return TextToSpeech.Engine.FALLBACK_TTS_DEFAULT_COUNTRY; // no setting found, use the current Locale to determine the default country
return Locale.getDefault().getISO3Country();
} else { } else {
return defaultCountry; return defaultCountry;
} }
@@ -205,7 +208,8 @@ public class TtsService extends Service implements OnCompletionListener {
String defaultVar = android.provider.Settings.Secure.getString(mResolver, String defaultVar = android.provider.Settings.Secure.getString(mResolver,
android.provider.Settings.Secure.TTS_DEFAULT_VARIANT); android.provider.Settings.Secure.TTS_DEFAULT_VARIANT);
if (defaultVar == null) { if (defaultVar == null) {
return TextToSpeech.Engine.FALLBACK_TTS_DEFAULT_VARIANT; // no setting found, use the current Locale to determine the default variant
return Locale.getDefault().getVariant();
} else { } else {
return defaultVar; return defaultVar;
} }