diff options
| author | Eric Laurent <elaurent@google.com> | 2011-02-17 17:31:51 -0800 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2011-02-17 17:31:51 -0800 |
| commit | e2ad901f4a7ec645c8711b19f0af379bab363c44 (patch) | |
| tree | 6c9f80c4c8b208b97f97a612d26d6e4c4c2f1851 /core | |
| parent | 33bfb66fe2850366bcef2a35a13ba6ffc48a580b (diff) | |
| download | frameworks_base-e2ad901f4a7ec645c8711b19f0af379bab363c44.zip frameworks_base-e2ad901f4a7ec645c8711b19f0af379bab363c44.tar.gz frameworks_base-e2ad901f4a7ec645c8711b19f0af379bab363c44.tar.bz2 | |
Added bluetooth SCO stream to VolumePanel
This is a preliminary change to enable control of BLUETOOTH_SCO stream
volume while in a video chat with a bluetooth headset.
The complete change requires a new icon for BT SCO volume.
Change-Id: I6cd22f0c73d80a9b404b228650b9a30ef144cedc
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/VolumePanel.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/view/VolumePanel.java b/core/java/android/view/VolumePanel.java index 89b7aaa..9e9f46f 100644 --- a/core/java/android/view/VolumePanel.java +++ b/core/java/android/view/VolumePanel.java @@ -129,6 +129,7 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie // List of stream types and their order // RING and VOICE_CALL are hidden unless explicitly requested private static final int [] STREAM_TYPES = { + AudioManager.STREAM_BLUETOOTH_SCO, AudioManager.STREAM_RING, AudioManager.STREAM_VOICE_CALL, AudioManager.STREAM_MUSIC, @@ -137,6 +138,7 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie // These icons need to correspond to the ones above. private static final int [] STREAM_ICONS_NORMAL = { + R.drawable.ic_audio_bt, R.drawable.ic_audio_phone, R.drawable.ic_audio_phone, R.drawable.ic_audio_vol, @@ -145,6 +147,7 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie // These icons need to correspond to the ones above. private static final int [] STREAM_ICONS_MUTED = { + R.drawable.ic_audio_bt, R.drawable.ic_audio_phone, R.drawable.ic_audio_phone, R.drawable.ic_audio_vol_mute, @@ -277,6 +280,7 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie final int streamType = STREAM_TYPES[i]; if (streamType == AudioManager.STREAM_RING || streamType == AudioManager.STREAM_VOICE_CALL + || streamType == AudioManager.STREAM_BLUETOOTH_SCO || streamType == activeStreamType) { continue; } |