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

Fix bug 2017664.

Browse Source 
Use the new constant names in TextToSpeech.
This commit is contained in:
Jean-Michel Trivi
2009-07-28 15:13:35 -07:00
parent c157aadf56
commit 387dc0ca9c
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/TextToSpeechSettings.java
View File

@@ -59,7 +59,7 @@ public class TextToSpeechSettings extends PreferenceActivity implements
private static final String LOCALE_DELIMITER = "-"; private static final String LOCALE_DELIMITER = "-";
private static final String FALLBACK_TTS_DEFAULT_SYNTH = private static final String FALLBACK_TTS_DEFAULT_SYNTH =
TextToSpeech.Engine.FALLBACK_TTS_DEFAULT_SYNTH; TextToSpeech.Engine.DEFAULT_SYNTH;
private Preference mPlayExample = null; private Preference mPlayExample = null;
private Preference mInstallData = null; private Preference mInstallData = null;
@@ -141,7 +141,7 @@ public class TextToSpeechSettings extends PreferenceActivity implements
intVal = Settings.Secure.getInt(resolver, TTS_USE_DEFAULTS); intVal = Settings.Secure.getInt(resolver, TTS_USE_DEFAULTS);
} catch (SettingNotFoundException e) { } catch (SettingNotFoundException e) {
// "use default" setting not found, initialize it // "use default" setting not found, initialize it
intVal = TextToSpeech.Engine.FALLBACK_TTS_USE_DEFAULTS; intVal = TextToSpeech.Engine.USE_DEFAULTS;
Settings.Secure.putInt(resolver, TTS_USE_DEFAULTS, intVal); Settings.Secure.putInt(resolver, TTS_USE_DEFAULTS, intVal);
} }
mUseDefaultPref.setChecked(intVal == 1); mUseDefaultPref.setChecked(intVal == 1);
@@ -162,7 +162,7 @@ public class TextToSpeechSettings extends PreferenceActivity implements
intVal = Settings.Secure.getInt(resolver, TTS_DEFAULT_RATE); intVal = Settings.Secure.getInt(resolver, TTS_DEFAULT_RATE);
} catch (SettingNotFoundException e) { } catch (SettingNotFoundException e) {
// default rate setting not found, initialize it // default rate setting not found, initialize it
intVal = TextToSpeech.Engine.FALLBACK_TTS_DEFAULT_RATE; intVal = TextToSpeech.Engine.DEFAULT_RATE;
Settings.Secure.putInt(resolver, TTS_DEFAULT_RATE, intVal); Settings.Secure.putInt(resolver, TTS_DEFAULT_RATE, intVal);
} }
mDefaultRatePref.setValue(String.valueOf(intVal)); mDefaultRatePref.setValue(String.valueOf(intVal));
@@ -223,7 +223,7 @@ public class TextToSpeechSettings extends PreferenceActivity implements
private void checkVoiceData() { private void checkVoiceData() {
PackageManager pm = getPackageManager(); PackageManager pm = getPackageManager();
Intent intent = new Intent(); Intent intent = new Intent();
intent.setAction("android.intent.action.CHECK_TTS_DATA"); intent.setAction(TextToSpeech.Engine.ACTION_CHECK_TTS_DATA);
List<ResolveInfo> resolveInfos = pm.queryIntentActivities(intent, 0); List<ResolveInfo> resolveInfos = pm.queryIntentActivities(intent, 0);
// query only the package that matches that of the default engine // query only the package that matches that of the default engine
for (int i = 0; i < resolveInfos.size(); i++) { for (int i = 0; i < resolveInfos.size(); i++) {
@@ -243,7 +243,7 @@ public class TextToSpeechSettings extends PreferenceActivity implements
private void installVoiceData() { private void installVoiceData() {
PackageManager pm = getPackageManager(); PackageManager pm = getPackageManager();
Intent intent = new Intent(); Intent intent = new Intent();
intent.setAction("android.intent.action.INSTALL_TTS_DATA"); intent.setAction(TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA);
List<ResolveInfo> resolveInfos = pm.queryIntentActivities(intent, 0); List<ResolveInfo> resolveInfos = pm.queryIntentActivities(intent, 0);
// query only the package that matches that of the default engine // query only the package that matches that of the default engine
for (int i = 0; i < resolveInfos.size(); i++) { for (int i = 0; i < resolveInfos.size(); i++) {
@@ -260,7 +260,7 @@ public class TextToSpeechSettings extends PreferenceActivity implements
* Called when the TTS engine is initialized. * Called when the TTS engine is initialized.
*/ */
public void onInit(int status) { public void onInit(int status) {
if (status == TextToSpeech.TTS_SUCCESS) { if (status == TextToSpeech.SUCCESS) {
Log.v(TAG, "TTS engine for settings screen initialized."); Log.v(TAG, "TTS engine for settings screen initialized.");
mEnableDemo = true; mEnableDemo = true;
} else { } else {
@@ -337,7 +337,7 @@ public class TextToSpeechSettings extends PreferenceActivity implements
// Play example // Play example
if (mTts != null) { if (mTts != null) {
mTts.speak(getResources().getString(R.string.tts_demo), mTts.speak(getResources().getString(R.string.tts_demo),
TextToSpeech.TTS_QUEUE_FLUSH, null); TextToSpeech.QUEUE_FLUSH, null);
} }
return true; return true;
} }