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

am 7a5911a9: am 375545e2: am 6829c48c: Merge "Fix F/C in TTS settings"

Browse Source 
* commit '7a5911a96d158567bac1e892aee813af1b563a46':
  Fix F/C in TTS settings
This commit is contained in:
Przemyslaw Szczepaniak
2014-03-13 23:12:10 +00:00
committed by Android Git Automerger
parent 7e74b409aa 7a5911a96d
commit cc91f6ff66
1 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.MissingResourceException;
import java.util.Set; import java.util.Set;
public class TextToSpeechSettings extends SettingsPreferenceFragment implements public class TextToSpeechSettings extends SettingsPreferenceFragment implements
@@ -277,25 +278,32 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
if (mCurrentDefaultLocale == null || mAvailableStrLocals == null) { if (mCurrentDefaultLocale == null || mAvailableStrLocals == null) {
return false; return false;
} }
int defaultAvailable = mTts.setLanguage(mCurrentDefaultLocale);
// Check if language is listed in CheckVoices Action result as available voice.
String defaultLocaleStr = mCurrentDefaultLocale.getISO3Language();
boolean notInAvailableLangauges = true; boolean notInAvailableLangauges = true;
if (!TextUtils.isEmpty(mCurrentDefaultLocale.getISO3Country())) { try {
defaultLocaleStr += "-" + mCurrentDefaultLocale.getISO3Country(); // Check if language is listed in CheckVoices Action result as available voice.
} String defaultLocaleStr = mCurrentDefaultLocale.getISO3Language();
if (!TextUtils.isEmpty(mCurrentDefaultLocale.getVariant())) { if (!TextUtils.isEmpty(mCurrentDefaultLocale.getISO3Country())) {
defaultLocaleStr += "-" + mCurrentDefaultLocale.getVariant(); defaultLocaleStr += "-" + mCurrentDefaultLocale.getISO3Country();
}
for (String loc : mAvailableStrLocals) {
if (loc.equalsIgnoreCase(defaultLocaleStr)) {
notInAvailableLangauges = false;
break;
} }
if (!TextUtils.isEmpty(mCurrentDefaultLocale.getVariant())) {
defaultLocaleStr += "-" + mCurrentDefaultLocale.getVariant();
}
for (String loc : mAvailableStrLocals) {
if (loc.equalsIgnoreCase(defaultLocaleStr)) {
notInAvailableLangauges = false;
break;
}
}
} catch (MissingResourceException e) {
if (DBG) Log.wtf(TAG, "MissingResourceException", e);
updateEngineStatus(R.string.tts_status_not_supported);
updateWidgetState(false);
return false;
} }
int defaultAvailable = mTts.setLanguage(mCurrentDefaultLocale);
if (defaultAvailable == TextToSpeech.LANG_NOT_SUPPORTED || if (defaultAvailable == TextToSpeech.LANG_NOT_SUPPORTED ||
defaultAvailable == TextToSpeech.LANG_MISSING_DATA || defaultAvailable == TextToSpeech.LANG_MISSING_DATA ||
notInAvailableLangauges) { notInAvailableLangauges) {
@@ -314,7 +322,6 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
} }
} }
/** /**
* Ask the current default engine to return a string of sample text to be * Ask the current default engine to return a string of sample text to be
* spoken to the user. * spoken to the user.
@@ -357,16 +364,21 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
private String getDefaultSampleString() { private String getDefaultSampleString() {
if (mTts != null && mTts.getLanguage() != null) { if (mTts != null && mTts.getLanguage() != null) {
final String currentLang = mTts.getLanguage().getISO3Language(); try {
String[] strings = getActivity().getResources().getStringArray( final String currentLang = mTts.getLanguage().getISO3Language();
R.array.tts_demo_strings); String[] strings = getActivity().getResources().getStringArray(
String[] langs = getActivity().getResources().getStringArray( R.array.tts_demo_strings);
R.array.tts_demo_string_langs); String[] langs = getActivity().getResources().getStringArray(
R.array.tts_demo_string_langs);
for (int i = 0; i < strings.length; ++i) { for (int i = 0; i < strings.length; ++i) {
if (langs[i].equals(currentLang)) { if (langs[i].equals(currentLang)) {
return strings[i]; return strings[i];
}
} }
} catch (MissingResourceException e) {
if (DBG) Log.wtf(TAG, "MissingResourceException", e);
// Ignore and fall back to default sample string
} }
} }
return getString(R.string.tts_default_sample_string); return getString(R.string.tts_default_sample_string);