Merge "Changes for new vibration policy." into jb-dev

2012-05-08 15:27:05 -07:00
parent a4139dc0e5 17fe90a440
commit 98d262df0d
1 changed files with 1 additions and 1 deletions
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -117,7 +117,7 @@ public class RingerVolumePreference extends VolumePreference {

            if (mCheckBoxes[i] != null) {
                if (streamType == AudioManager.STREAM_RING && muted
-                        && mAudioManager.shouldVibrate(AudioManager.VIBRATE_TYPE_RINGER)) {
+                        && !(mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_SILENT)) {
                    mCheckBoxes[i].setImageResource(
                            com.android.internal.R.drawable.ic_audio_ring_notif_vibrate);
                } else {