Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b02e254d authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

am 7692d1f1: Merge "Display vibrate icon in volume panel" into jb-mr2-dev 

* commit '7692d1f1':
  Display vibrate icon in volume panel
parents ae026596 7692d1f1

core/java/android/view/VolumePanel.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

        }