Merge "Add alarm volume to the list of volumes in the volume overlay." into ics-mr0 (541f6cfb) · Commits · e / os / android_frameworks_base

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 */