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

Commit 29019cb9 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am c96307ef: Merge "Make the silent/vibrate status icon reflect overall device... 

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

Merge commit 'c96307ef' into froyo-plus-aosp

* commit 'c96307ef':
  Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)
parents 15feb4de c96307ef

services/java/com/android/server/status/StatusBarPolicy.java

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