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

Merge "Take TextToSpeechSettings out of endless loop"

Browse Source
This commit is contained in:
Craig Mautner
2014-06-30 14:48:01 +00:00
committed by Android (Google) Code Review
parent 8d020f6c08 5a98d43681
commit 746078fb71
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,6 +47,7 @@ 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.MissingResourceException;
import java.util.Objects;
import java.util.Set; import java.util.Set;
public class TextToSpeechSettings extends SettingsPreferenceFragment implements public class TextToSpeechSettings extends SettingsPreferenceFragment implements
@@ -104,7 +105,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
private TextToSpeech mTts = null; private TextToSpeech mTts = null;
private TtsEngines mEnginesHelper = null; private TtsEngines mEnginesHelper = null;
private String mSampleText = ""; private String mSampleText = null;
/** /**
* Default locale used by selected TTS engine, null if not connected to any engine. * Default locale used by selected TTS engine, null if not connected to any engine.
@@ -270,10 +271,14 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
// ISO-3166 alpha 3 country codes are out of spec. If we won't normalize, // ISO-3166 alpha 3 country codes are out of spec. If we won't normalize,
// we may end up with English (USA)and German (DEU). // we may end up with English (USA)and German (DEU).
final Locale oldDefaultLocale = mCurrentDefaultLocale;
mCurrentDefaultLocale = mEnginesHelper.parseLocaleString(defaultLocale.toString()); mCurrentDefaultLocale = mEnginesHelper.parseLocaleString(defaultLocale.toString());
if (!Objects.equals(oldDefaultLocale, mCurrentDefaultLocale)) {
mSampleText = null;
}
int defaultAvailable = mTts.setLanguage(defaultLocale); int defaultAvailable = mTts.setLanguage(defaultLocale);
if (evaluateDefaultLocale()) { if (evaluateDefaultLocale() && mSampleText == null) {
getSampleText(); getSampleText();
} }
} }