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

This commit is contained in:
Eric Laurent
2012-05-08 15:27:05 -07:00
committed by Android (Google) Code Review

View File

@@ -117,7 +117,7 @@ public class RingerVolumePreference extends VolumePreference {
if (mCheckBoxes[i] != null) { if (mCheckBoxes[i] != null) {
if (streamType == AudioManager.STREAM_RING && muted if (streamType == AudioManager.STREAM_RING && muted
&& mAudioManager.shouldVibrate(AudioManager.VIBRATE_TYPE_RINGER)) { && !(mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_SILENT)) {
mCheckBoxes[i].setImageResource( mCheckBoxes[i].setImageResource(
com.android.internal.R.drawable.ic_audio_ring_notif_vibrate); com.android.internal.R.drawable.ic_audio_ring_notif_vibrate);
} else { } else {