am 0e01f128: Fix for TTS settings crash.

* commit '0e01f128ab8a8525a4d3fd72980e468f4de1e56c':
  Fix for TTS settings crash.
This commit is contained in:
Przemyslaw Szczepaniak
2013-08-13 06:43:09 -07:00
committed by Android Git Automerger

View File

@@ -140,6 +140,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
mPlayExample = findPreference(KEY_PLAY_EXAMPLE); mPlayExample = findPreference(KEY_PLAY_EXAMPLE);
mPlayExample.setOnPreferenceClickListener(this); mPlayExample.setOnPreferenceClickListener(this);
mPlayExample.setEnabled(false);
mEnginePreferenceCategory = (PreferenceCategory) findPreference( mEnginePreferenceCategory = (PreferenceCategory) findPreference(
KEY_ENGINE_PREFERENCE_SECTION); KEY_ENGINE_PREFERENCE_SECTION);
@@ -363,6 +364,9 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
private boolean isNetworkRequiredForSynthesis() { private boolean isNetworkRequiredForSynthesis() {
Set<String> features = mTts.getFeatures(mCurrentDefaultLocale); Set<String> features = mTts.getFeatures(mCurrentDefaultLocale);
if (features == null) {
return false;
}
return features.contains(TextToSpeech.Engine.KEY_FEATURE_NETWORK_SYNTHESIS) && return features.contains(TextToSpeech.Engine.KEY_FEATURE_NETWORK_SYNTHESIS) &&
!features.contains(TextToSpeech.Engine.KEY_FEATURE_EMBEDDED_SYNTHESIS); !features.contains(TextToSpeech.Engine.KEY_FEATURE_EMBEDDED_SYNTHESIS);
} }