summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/TextToSpeechSettings.java
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2009-06-09 19:29:27 -0700
committerJean-Michel Trivi <jmtrivi@google.com>2009-06-10 17:12:41 -0700
commit8036862226b6cdb6903c2591e66b4b9328b1d484 (patch)
tree5d1fed416448317ea8ba3f59e32f66f68ab3de80 /src/com/android/settings/TextToSpeechSettings.java
parenta8d206265ba8bd9be41cf2dd222965688fdefb64 (diff)
downloadpackages_apps_Settings-8036862226b6cdb6903c2591e66b4b9328b1d484.zip
packages_apps_Settings-8036862226b6cdb6903c2591e66b4b9328b1d484.tar.gz
packages_apps_Settings-8036862226b6cdb6903c2591e66b4b9328b1d484.tar.bz2
Adding support for selecting the default language for Text-To-Speech in Settings.
Diffstat (limited to 'src/com/android/settings/TextToSpeechSettings.java')
-rw-r--r--src/com/android/settings/TextToSpeechSettings.java35
1 files changed, 29 insertions, 6 deletions
diff --git a/src/com/android/settings/TextToSpeechSettings.java b/src/com/android/settings/TextToSpeechSettings.java
index 02fc06d..79a841b 100644
--- a/src/com/android/settings/TextToSpeechSettings.java
+++ b/src/com/android/settings/TextToSpeechSettings.java
@@ -19,6 +19,7 @@ package com.android.settings;
import static android.provider.Settings.Secure.TTS_USE_DEFAULTS;
import static android.provider.Settings.Secure.TTS_DEFAULT_RATE;
import static android.provider.Settings.Secure.TTS_DEFAULT_PITCH;
+import static android.provider.Settings.Secure.TTS_DEFAULT_LANG;
import android.content.ContentResolver;
import android.os.Bundle;
@@ -38,15 +39,18 @@ public class TextToSpeechSettings extends PreferenceActivity implements
private static final int FALLBACK_TTS_DEFAULT_RATE = 100; // 1x
private static final int FALLBACK_TTS_DEFAULT_PITCH = 100;// 1x
private static final int FALLBACK_TTS_USE_DEFAULTS = 1;
+ private static final String FALLBACK_TTS_DEFAULT_LANG = "en-rUS";
private static final String KEY_TTS_USE_DEFAULT =
"toggle_use_default_tts_settings";
private static final String KEY_TTS_DEFAULT_RATE = "tts_default_rate";
private static final String KEY_TTS_DEFAULT_PITCH = "tts_default_pitch";
+ private static final String KEY_TTS_DEFAULT_LANG = "tts_default_lang";
private CheckBoxPreference mUseDefaultPref = null;
private ListPreference mDefaultRatePref = null;
private ListPreference mDefaultPitchPref = null;
+ private ListPreference mDefaultLangPref = null;
@Override
@@ -65,7 +69,7 @@ public class TextToSpeechSettings extends PreferenceActivity implements
// "Use Defaults"
mUseDefaultPref =
(CheckBoxPreference) findPreference(KEY_TTS_USE_DEFAULT);
- mUseDefaultPref.setChecked(Settings.System.getInt(resolver,
+ mUseDefaultPref.setChecked(Settings.Secure.getInt(resolver,
TTS_USE_DEFAULTS,
FALLBACK_TTS_USE_DEFAULTS) == 1 ? true : false);
mUseDefaultPref.setOnPreferenceChangeListener(this);
@@ -73,17 +77,30 @@ public class TextToSpeechSettings extends PreferenceActivity implements
// Default rate
mDefaultRatePref =
(ListPreference) findPreference(KEY_TTS_DEFAULT_RATE);
- mDefaultRatePref.setValue(String.valueOf(Settings.System.getInt(
+ mDefaultRatePref.setValue(String.valueOf(Settings.Secure.getInt(
resolver, TTS_DEFAULT_RATE, FALLBACK_TTS_DEFAULT_RATE)));
mDefaultRatePref.setOnPreferenceChangeListener(this);
// Default pitch
mDefaultPitchPref =
(ListPreference) findPreference(KEY_TTS_DEFAULT_PITCH);
- mDefaultPitchPref.setValue(String.valueOf(Settings.System.getInt(
+ mDefaultPitchPref.setValue(String.valueOf(Settings.Secure.getInt(
resolver, TTS_DEFAULT_PITCH, FALLBACK_TTS_DEFAULT_PITCH)));
mDefaultPitchPref.setOnPreferenceChangeListener(this);
+ // Default language
+ mDefaultLangPref =
+ (ListPreference) findPreference(KEY_TTS_DEFAULT_LANG);
+ String defaultLang = String.valueOf(Settings.Secure.getString(resolver,
+ TTS_DEFAULT_LANG));
+ if (defaultLang.compareTo("null") == 0) {
+ mDefaultLangPref.setValue(FALLBACK_TTS_DEFAULT_LANG);
+ Log.i(TAG, "TTS initDefaultSettings() default lang null ");
+ } else {
+ mDefaultLangPref.setValue(defaultLang);
+ Log.i(TAG, "TTS initDefaultSettings() default lang is "+defaultLang);
+ }
+ mDefaultLangPref.setOnPreferenceChangeListener(this);
}
@@ -91,14 +108,14 @@ public class TextToSpeechSettings extends PreferenceActivity implements
if (KEY_TTS_USE_DEFAULT.equals(preference.getKey())) {
// "Use Defaults"
int value = (Boolean)objValue ? 1 : 0;
- Settings.System.putInt(getContentResolver(), TTS_USE_DEFAULTS,
+ Settings.Secure.putInt(getContentResolver(), TTS_USE_DEFAULTS,
value);
Log.i(TAG, "TTS use default settings is "+objValue.toString());
} else if (KEY_TTS_DEFAULT_RATE.equals(preference.getKey())) {
// Default rate
int value = Integer.parseInt((String) objValue);
try {
- Settings.System.putInt(getContentResolver(),
+ Settings.Secure.putInt(getContentResolver(),
TTS_DEFAULT_RATE, value);
Log.i(TAG, "TTS default rate is "+value);
} catch (NumberFormatException e) {
@@ -108,12 +125,18 @@ public class TextToSpeechSettings extends PreferenceActivity implements
// Default pitch
int value = Integer.parseInt((String) objValue);
try {
- Settings.System.putInt(getContentResolver(),
+ Settings.Secure.putInt(getContentResolver(),
TTS_DEFAULT_PITCH, value);
Log.i(TAG, "TTS default pitch is "+value);
} catch (NumberFormatException e) {
Log.e(TAG, "could not persist default TTS pitch setting", e);
}
+ }else if (KEY_TTS_DEFAULT_LANG.equals(preference.getKey())) {
+ // Default language
+ String value = (String) objValue;
+ Settings.Secure.putString(getContentResolver(),
+ TTS_DEFAULT_LANG, value);
+ Log.i(TAG, "TTS default lang is "+value);
}
return true;