commit eb72bcd6d07708bfc65eec474092f136e822c9fb
author Amith Yamasani <yamasani@google.com> Tue Jul 07 11:37:08 2009 -0700
committer Amith Yamasani <yamasani@google.com> Tue Jul 07 14:42:50 2009 -0700
tree 7f3f48260b2e28665062451b5b16094f9ee39e78
parent c4a3bf94cc870d940df37756ed2c5ea7067d00da

Fix vibrate and silent mode toggle dependency.

src/com/android/settings/SoundAndDisplaySettings.java

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 @@
                 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);