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

Commit 06a77ad5 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am 541f6cfb: Merge "Add alarm volume to the list of volumes in the volume overlay." into ics-mr0 

* commit '541f6cfb':
  Add alarm volume to the list of volumes in the volume overlay.
parents 4235d34d 541f6cfb

core/java/android/view/VolumePanel.java

+7 −1
Original line number Diff line number Diff line
@@ -134,6 +134,11 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie 
                R.drawable.ic_audio_phone,

                R.drawable.ic_audio_phone,

                false),

        AlarmStream(AudioManager.STREAM_ALARM,

                R.string.volume_alarm,

                R.drawable.ic_audio_alarm,

                R.drawable.ic_audio_alarm_mute,

                false),

        MediaStream(AudioManager.STREAM_MUSIC,

                R.string.volume_icon_description_media,

                R.drawable.ic_audio_vol,
@@ -167,7 +172,8 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie 
        StreamResources.RingerStream,

        StreamResources.VoiceStream,

        StreamResources.MediaStream,

        StreamResources.NotificationStream

        StreamResources.NotificationStream,

        StreamResources.AlarmStream

    };



    /** Object that contains data for each slider */