diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-10-14 17:24:47 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2011-10-14 17:24:47 -0700 |
| commit | 92e1b2d37be8d3d76a55d0242b3cfab7fd8e449a (patch) | |
| tree | e7bab9511e0ec2d0e247adf331a6101c4f01dc5f /core/java | |
| parent | e6fee18d16a86c266afef48f7705268435a99111 (diff) | |
| download | frameworks_base-92e1b2d37be8d3d76a55d0242b3cfab7fd8e449a.zip frameworks_base-92e1b2d37be8d3d76a55d0242b3cfab7fd8e449a.tar.gz frameworks_base-92e1b2d37be8d3d76a55d0242b3cfab7fd8e449a.tar.bz2 | |
Add alarm volume to the list of volumes in the volume overlay.
This will be used only for adjusting the alarm volume when an
alarm ringtone is being selected.
Bug: 5164828
Change-Id: Ia4a12b1946fb0715e97101bfd389c6bd33c448c7
Diffstat (limited to 'core/java')
| -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 cdf1f8d..83df8a5 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 */ |