diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-10-17 09:42:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-17 09:42:52 -0700 |
| commit | 541f6cfba8d1beb240e841530a761a084e354f64 (patch) | |
| tree | eae54ab46cfcd3a4cb2887f00d780a452f90be00 /core/java/android | |
| parent | 39268ffcb74f4c177e5e7427b66480c77743f928 (diff) | |
| parent | 92e1b2d37be8d3d76a55d0242b3cfab7fd8e449a (diff) | |
Merge "Add alarm volume to the list of volumes in the volume overlay." into ics-mr0
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/VolumePanel.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/view/VolumePanel.java b/core/java/android/view/VolumePanel.java index cdf1f8df3f54..83df8a5b3522 100644 --- a/core/java/android/view/VolumePanel.java +++ b/core/java/android/view/VolumePanel.java @@ -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 */ |