From 91c8346bbc0605f1255e2f26512b5f1d31dc5473 Mon Sep 17 00:00:00 2001 From: changbetty Date: Tue, 29 Nov 2022 03:08:08 +0000 Subject: [LE Audio] Add BT LE headset check for voice call to update the icon bug: 240506858 Test: manual test Test: atest VolumeDialogControllerImplTest Test: atest VolumeDialogImplTest Change-Id: Id14ccbc7d3b9343f91c2356000229a0af0e9ced3 --- .../com/android/systemui/volume/VolumeDialogControllerImpl.java | 5 +++++ .../src/com/android/systemui/volume/VolumeDialogImpl.java | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'packages/SystemUI/src') diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java index 7c022eb41cd5..98d904e60603 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java @@ -431,6 +431,11 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa AudioManager.DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER | AudioManager.DEVICE_OUT_BLE_HEADSET)) != 0; changed |= updateStreamRoutedToBluetoothW(stream, routedToBluetooth); + } else if (stream == AudioManager.STREAM_VOICE_CALL) { + final boolean routedToBluetooth = + (mAudio.getDevicesForStream(AudioManager.STREAM_VOICE_CALL) + & AudioManager.DEVICE_OUT_BLE_HEADSET) != 0; + changed |= updateStreamRoutedToBluetoothW(stream, routedToBluetooth); } return changed; } diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java index 63b98bb84135..d60f66386842 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java @@ -1770,6 +1770,7 @@ public class VolumeDialogImpl implements VolumeDialog, if (ss.level == row.requestedLevel) { row.requestedLevel = -1; } + final boolean isVoiceCallStream = row.stream == AudioManager.STREAM_VOICE_CALL; final boolean isA11yStream = row.stream == STREAM_ACCESSIBILITY; final boolean isRingStream = row.stream == AudioManager.STREAM_RING; final boolean isSystemStream = row.stream == AudioManager.STREAM_SYSTEM; @@ -1814,8 +1815,12 @@ public class VolumeDialogImpl implements VolumeDialog, } else if (isRingSilent || zenMuted) { iconRes = row.iconMuteRes; } else if (ss.routedToBluetooth) { - iconRes = isStreamMuted(ss) ? R.drawable.ic_volume_media_bt_mute - : R.drawable.ic_volume_media_bt; + if (isVoiceCallStream) { + iconRes = R.drawable.ic_volume_bt_sco; + } else { + iconRes = isStreamMuted(ss) ? R.drawable.ic_volume_media_bt_mute + : R.drawable.ic_volume_media_bt; + } } else if (isStreamMuted(ss)) { iconRes = ss.muted ? R.drawable.ic_volume_media_off : row.iconMuteRes; } else { -- cgit v1.2.3-59-g8ed1b