Merge "Display vibrate icon in volume menu" into jb-mr2-dev

This commit is contained in:
Eric Laurent
2013-03-28 22:27:44 +00:00
committed by Android (Google) Code Review

View File

@@ -115,7 +115,8 @@ public class RingerVolumePreference extends VolumePreference {
boolean muted = mAudioManager.isStreamMute(streamType);
if (mCheckBoxes[i] != null) {
if ((streamType == AudioManager.STREAM_RING) &&
if (((streamType == AudioManager.STREAM_RING) ||
(streamType == AudioManager.STREAM_NOTIFICATION)) &&
(mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE)) {
mCheckBoxes[i].setImageResource(
com.android.internal.R.drawable.ic_audio_ring_notif_vibrate);