am 6829c48c: Merge "Fix F/C in TTS settings" (38aeec0a) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/tts/TextToSpeechSettings.java

+35 −23

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@ import java.util.ArrayList;
		import java.util.HashMap;
		import java.util.List;
		import java.util.Locale;
		import java.util.MissingResourceException;
		import java.util.Set;

		public class TextToSpeechSettings extends SettingsPreferenceFragment implements
		@@ -278,11 +279,11 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
		if (mCurrentDefaultLocale == null \|\| mAvailableStrLocals == null) {
		return false;
		}
		int defaultAvailable = mTts.setLanguage(mCurrentDefaultLocale);

		boolean notInAvailableLangauges = true;
		try {
		// Check if language is listed in CheckVoices Action result as available voice.
		String defaultLocaleStr = mCurrentDefaultLocale.getISO3Language();
		boolean notInAvailableLangauges = true;
		if (!TextUtils.isEmpty(mCurrentDefaultLocale.getISO3Country())) {
		defaultLocaleStr += "-" + mCurrentDefaultLocale.getISO3Country();
		}
		@@ -296,7 +297,14 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
		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 \|\|
		defaultAvailable == TextToSpeech.LANG_MISSING_DATA \|\|
		notInAvailableLangauges) {
		@@ -315,7 +323,6 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
		}
		}


		/**
		* Ask the current default engine to return a string of sample text to be
		* spoken to the user.
		@@ -358,6 +365,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements

		private String getDefaultSampleString() {
		if (mTts != null && mTts.getLanguage() != null) {
		try {
		final String currentLang = mTts.getLanguage().getISO3Language();
		String[] strings = getActivity().getResources().getStringArray(
		R.array.tts_demo_strings);
		@@ -369,6 +377,10 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
		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);
		}