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

This commit is contained in:
Daniel Sandler
2010-04-20 12:57:54 -07:00
committed by Android (Google) Code Review

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;