commit 98d262df0d0b6eb76b9ddbfb75cc5076a08301db
author Eric Laurent <elaurent@google.com> Tue May 08 15:27:05 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 08 15:27:05 2012 -0700
tree 3ce7eb7030000c2512b82967d3dab6918c2f5256
parent a4139dc0e5db8eead3bbb4f68167e86a2a6402a5
parent 17fe90a44038942201fbc233ed80c341397de4d7

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

src/com/android/settings/RingerVolumePreference.java

diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index 5845c8f..c80cd35 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -117,7 +117,7 @@
 
             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 {