diff options
| -rw-r--r-- | src/com/android/settings/SoundAndDisplaySettings.java | 34 | ||||
| -rw-r--r-- | src/com/android/settings/TextToSpeechSettings.java | 8 |
2 files changed, 20 insertions, 22 deletions
diff --git a/src/com/android/settings/SoundAndDisplaySettings.java b/src/com/android/settings/SoundAndDisplaySettings.java index 3d3a5d0..8e7411c 100644 --- a/src/com/android/settings/SoundAndDisplaySettings.java +++ b/src/com/android/settings/SoundAndDisplaySettings.java @@ -216,33 +216,29 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements Settings.System.ACCELEROMETER_ROTATION, 0) != 0); } + private void setRingerMode(boolean silent, boolean vibrate) { + if (silent) { + mAudioManager.setRingerMode(vibrate ? AudioManager.RINGER_MODE_VIBRATE : + AudioManager.RINGER_MODE_SILENT); + } else { + mAudioManager.setRingerMode(AudioManager.RINGER_MODE_NORMAL); + mAudioManager.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER, + vibrate ? AudioManager.VIBRATE_SETTING_ON + : AudioManager.VIBRATE_SETTING_OFF); + } + } + @Override public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) { - if (preference == mSilent) { - final boolean silent = mSilent.isChecked(); - mAudioManager.setRingerMode(silent ? AudioManager.RINGER_MODE_SILENT - : AudioManager.RINGER_MODE_NORMAL); - updateState(false); - + if (preference == mSilent || preference == mVibrate) { + setRingerMode(mSilent.isChecked(), mVibrate.isChecked()); + if (preference == mSilent) updateState(false); } else if (preference == mPlayMediaNotificationSounds) { try { mMountService.setPlayNotificationSounds(mPlayMediaNotificationSounds.isChecked()); } catch (RemoteException e) { } - } else if (preference == mVibrate) { - final boolean vibrate = mVibrate.isChecked(); - final boolean silent = mSilent.isChecked(); - - if (silent) { - mAudioManager.setRingerMode(vibrate ? AudioManager.RINGER_MODE_VIBRATE : - AudioManager.RINGER_MODE_SILENT); - } else { - mAudioManager.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER, - vibrate ? AudioManager.VIBRATE_SETTING_ON - : AudioManager.VIBRATE_SETTING_OFF); - } - } else if (preference == mDtmfTone) { Settings.System.putInt(getContentResolver(), Settings.System.DTMF_TONE_WHEN_DIALING, mDtmfTone.isChecked() ? 1 : 0); diff --git a/src/com/android/settings/TextToSpeechSettings.java b/src/com/android/settings/TextToSpeechSettings.java index 11998a3..88bfc67 100644 --- a/src/com/android/settings/TextToSpeechSettings.java +++ b/src/com/android/settings/TextToSpeechSettings.java @@ -191,8 +191,9 @@ public class TextToSpeechSettings extends PreferenceActivity implements country = Settings.Secure.getString(resolver, KEY_TTS_DEFAULT_COUNTRY); if (country == null) { // default country setting not found, initialize it, as well as the variant; - country = TextToSpeech.Engine.FALLBACK_TTS_DEFAULT_COUNTRY; - variant = TextToSpeech.Engine.FALLBACK_TTS_DEFAULT_VARIANT; + Locale currentLocale = Locale.getDefault(); + country = currentLocale.getISO3Country(); + variant = currentLocale.getVariant(); Settings.Secure.putString(resolver, TTS_DEFAULT_COUNTRY, country); Settings.Secure.putString(resolver, TTS_DEFAULT_VARIANT, variant); } @@ -203,7 +204,8 @@ public class TextToSpeechSettings extends PreferenceActivity implements variant = Settings.Secure.getString(resolver, KEY_TTS_DEFAULT_VARIANT); if (variant == null) { // default variant setting not found, initialize it - variant = TextToSpeech.Engine.FALLBACK_TTS_DEFAULT_VARIANT; + Locale currentLocale = Locale.getDefault(); + variant = currentLocale.getVariant(); Settings.Secure.putString(resolver, TTS_DEFAULT_VARIANT, variant); } } |