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

am c96307ef: Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo

Browse Source 
Merge commit 'c96307efd2829cdd0fa7c835484f2f89edf7d883' into froyo-plus-aosp

* commit 'c96307efd2829cdd0fa7c835484f2f89edf7d883':
  Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)
This commit is contained in:
Daniel Sandler
2010-04-20 13:01:58 -07:00
committed by Android Git Automerger
parent 15feb4defc c96307efd2
commit 29019cb977
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/status/StatusBarPolicy.java
View File

@@ -1176,7 +1176,7 @@ public class StatusBarPolicy {
final int ringerMode = audioManager.getRingerMode();
final boolean visible = ringerMode == AudioManager.RINGER_MODE_SILENT ||
ringerMode == AudioManager.RINGER_MODE_VIBRATE;
final int iconId = audioManager.shouldVibrate(AudioManager.VIBRATE_TYPE_RINGER)
final int iconId = (ringerMode == AudioManager.RINGER_MODE_VIBRATE)
? com.android.internal.R.drawable.stat_sys_ringer_vibrate
: com.android.internal.R.drawable.stat_sys_ringer_silent;