PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am eb306b4c: Fix for empty "Listen to an example" string.

Browse Source 
* commit 'eb306b4c15d721c69255f02497d2bcebff0c265f':
  Fix for empty "Listen to an example" string.
This commit is contained in:
Przemyslaw Szczepaniak
2013-09-10 03:19:12 -07:00
committed by Android Git Automerger
parent 97b1f61958 eb306b4c15
commit 7d51da8057
1 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/com/android/settings/tts/TextToSpeechSettings.java
View File

@@ -104,7 +104,17 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
private TtsEngines mEnginesHelper = null; private TtsEngines mEnginesHelper = null;
private String mSampleText = ""; private String mSampleText = "";
/**
* Default locale used by selected TTS engine, null if not connected to any engine.
*/
private Locale mCurrentDefaultLocale; private Locale mCurrentDefaultLocale;
/**
* List of available locals of selected TTS engine, as returned by
* {@link TextToSpeech.Engine#ACTION_CHECK_TTS_DATA} activity. If empty, then activity
* was not yet called.
*/
private List<String> mAvailableStrLocals; private List<String> mAvailableStrLocals;
/** /**
@@ -263,7 +273,9 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
} }
private boolean evaluateDefaultLocale() { private boolean evaluateDefaultLocale() {
if (mCurrentDefaultLocale == null) { // Check if we are connected to the engine, and CHECK_VOICE_DATA returned list
// of available languages.
if (mCurrentDefaultLocale == null || mAvailableStrLocals == null) {
return false; return false;
} }
int defaultAvailable = mTts.setLanguage(mCurrentDefaultLocale); int defaultAvailable = mTts.setLanguage(mCurrentDefaultLocale);
@@ -277,18 +289,17 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
if (!TextUtils.isEmpty(mCurrentDefaultLocale.getVariant())) { if (!TextUtils.isEmpty(mCurrentDefaultLocale.getVariant())) {
defaultLocaleStr += "-" + mCurrentDefaultLocale.getVariant(); defaultLocaleStr += "-" + mCurrentDefaultLocale.getVariant();
} }
if (mAvailableStrLocals != null) {
for (String loc : mAvailableStrLocals) { for (String loc : mAvailableStrLocals) {
if (loc.equalsIgnoreCase(defaultLocaleStr)) { if (loc.equalsIgnoreCase(defaultLocaleStr)) {
notInAvailableLangauges = false; notInAvailableLangauges = false;
break; break;
}
} }
} }
if (defaultAvailable == TextToSpeech.LANG_NOT_SUPPORTED || if (defaultAvailable == TextToSpeech.LANG_NOT_SUPPORTED ||
defaultAvailable == TextToSpeech.LANG_MISSING_DATA || defaultAvailable == TextToSpeech.LANG_MISSING_DATA ||
mAvailableStrLocals == null || notInAvailableLangauges) { notInAvailableLangauges) {
if (DBG) Log.d(TAG, "Default locale for this TTS engine is not supported."); if (DBG) Log.d(TAG, "Default locale for this TTS engine is not supported.");
updateEngineStatus(R.string.tts_status_not_supported); updateEngineStatus(R.string.tts_status_not_supported);
updateWidgetState(false); updateWidgetState(false);
@@ -557,8 +568,15 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
Settings.Secure.putString(getContentResolver(), TTS_DEFAULT_SYNTH, engine); Settings.Secure.putString(getContentResolver(), TTS_DEFAULT_SYNTH, engine);
mAvailableStrLocals = data.getStringArrayListExtra( mAvailableStrLocals = data.getStringArrayListExtra(
TextToSpeech.Engine.EXTRA_AVAILABLE_VOICES); TextToSpeech.Engine.EXTRA_AVAILABLE_VOICES);
evaluateDefaultLocale(); if (mAvailableStrLocals == null) {
Log.e(TAG, "Voice data check complete, but no available voices found");
// Set mAvailableStrLocals to empty list
mAvailableStrLocals = new ArrayList<String>();
}
if (evaluateDefaultLocale()) {
getSampleText();
}
final int engineCount = mEnginePreferenceCategory.getPreferenceCount(); final int engineCount = mEnginePreferenceCategory.getPreferenceCount();
for (int i = 0; i < engineCount; ++i) { for (int i = 0; i < engineCount; ++i) {