am 98d262df: Merge "Changes for new vibration policy." into jb-dev

* commit '98d262df0d0b6eb76b9ddbfb75cc5076a08301db':
  Changes for new vibration policy.
This commit is contained in:
Eric Laurent
2012-05-09 01:48:35 -07:00
committed by Android Git Automerger

View File

@@ -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 {