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

2013-03-28 22:08:05 +00:00
parent e861f4a3a5 8a51acae5d
commit 7692d1f165
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/view/VolumePanel.java
+++ b/core/java/android/view/VolumePanel.java
@@ -468,7 +468,8 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie
        // Force reloading the image resource
        sc.icon.setImageDrawable(null);
        sc.icon.setImageResource(muted ? sc.iconMuteRes : sc.iconRes);
-        if (sc.streamType == AudioManager.STREAM_RING &&
+        if (((sc.streamType == AudioManager.STREAM_RING) ||
+                (sc.streamType == AudioManager.STREAM_NOTIFICATION)) &&
                mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE) {
            sc.icon.setImageResource(R.drawable.ic_audio_ring_notif_vibrate);
        }