Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '7692d1f1654975ef0ef59e6b8dc881299194babf':
  Display vibrate icon in volume panel
This commit is contained in:
Eric Laurent
2013-03-28 15:10:03 -07:00
committed by Android Git Automerger
parent ae02659638 7692d1f165
commit b02e254d45
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/view/VolumePanel.java
View File

@@ -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);
}