Merge "Add alarm volume to the list of volumes in the volume overlay." into ics-mr0
diff --git a/core/java/android/view/VolumePanel.java b/core/java/android/view/VolumePanel.java
index cdf1f8d..83df8a5 100644
--- a/core/java/android/view/VolumePanel.java
+++ b/core/java/android/view/VolumePanel.java
@@ -134,6 +134,11 @@
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 @@
StreamResources.RingerStream,
StreamResources.VoiceStream,
StreamResources.MediaStream,
- StreamResources.NotificationStream
+ StreamResources.NotificationStream,
+ StreamResources.AlarmStream
};
/** Object that contains data for each slider */