diff options
| author | 2022-12-05 10:23:52 +0000 | |
|---|---|---|
| committer | 2022-12-05 10:23:52 +0000 | |
| commit | 5bbb106cedd74104d263ff0c53dae0d45918cc61 (patch) | |
| tree | f95b3908e0318ee6b4d7f3632d8ce7f8d4331260 /packages/SystemUI/src | |
| parent | 60c604f7de082ddde92a9fdfbb2894b8c88e1045 (diff) | |
| parent | e094dfde3ac520376c83ee77fab77e5f81dd9592 (diff) | |
Merge "[LE Audio] Add BT LE headset check for voice call to update the icon" into tm-qpr-dev am: e094dfde3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20580288
Change-Id: Ie1a27d0d68a1d3ba778aa30ce02eed2a152e03e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'packages/SystemUI/src')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java | 5 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java | 9 |
2 files changed, 12 insertions, 2 deletions
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 833a6a4193c4..1bc0d08844d7 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java @@ -1771,6 +1771,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; @@ -1815,8 +1816,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 { |