commit 480b2e440646e4859ebdd88b82441b4bd9a61651
author Amith Yamasani <yamasani@google.com> Fri Oct 28 19:40:42 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 28 19:40:42 2011 -0700
tree 1b383a3d7dbedee2bcb249781ad7a4e51a2e4510
parent 6fded4ab3fca2d79a82c40f90370b12489456dff
parent ca7205842aa2e0c6c3df027c32acce63dcc35e3b

Merge "Use vibrate icon in volume settings when appropriate." into ics-mr0

src/com/android/settings/RingerVolumePreference.java

diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index 22c05ca..59605c9 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -116,8 +116,14 @@
             boolean muted = mAudioManager.isStreamMute(streamType);
 
             if (mCheckBoxes[i] != null) {
-                mCheckBoxes[i].setImageResource(
-                        muted ? SEEKBAR_MUTED_RES_ID[i] : SEEKBAR_UNMUTED_RES_ID[i]);
+                if (streamType == AudioManager.STREAM_RING && muted
+                        && mAudioManager.shouldVibrate(AudioManager.VIBRATE_TYPE_RINGER)) {
+                    mCheckBoxes[i].setImageResource(
+                            com.android.internal.R.drawable.ic_audio_ring_notif_vibrate);
+                } else {
+                    mCheckBoxes[i].setImageResource(
+                            muted ? SEEKBAR_MUTED_RES_ID[i] : SEEKBAR_UNMUTED_RES_ID[i]);
+                }
             }
             if (mSeekBars[i] != null) {
                 mSeekBars[i].setEnabled(!muted);
@@ -362,7 +368,11 @@
         // Touching any of the mute buttons causes us to get the state from the system and toggle it
         switch(mAudioManager.getRingerMode()) {
             case AudioManager.RINGER_MODE_NORMAL:
-                mAudioManager.setRingerMode(AudioManager.RINGER_MODE_SILENT);
+                mAudioManager.setRingerMode(
+                        (Settings.System.getInt(getContext().getContentResolver(),
+                                Settings.System.VIBRATE_IN_SILENT, 1) == 1)
+                        ? AudioManager.RINGER_MODE_VIBRATE
+                        : AudioManager.RINGER_MODE_SILENT);
                 break;
             case AudioManager.RINGER_MODE_VIBRATE:
             case AudioManager.RINGER_MODE_SILENT: