From 6656b15b5b27d1e5ebbdadda5b4be7b989612663 Mon Sep 17 00:00:00 2001 From: basamaryan Date: Thu, 10 Aug 2023 19:16:13 +0200 Subject: [PATCH] Revert "SystemUI: VolumeDialog: add support for unlinked ringer streams" This reverts commit 898b7f150f2e582442ba8ab269867ed80ada8bed. --- .../ic_volume_ringer_mute_unlinked.xml | 34 ------------------ .../drawable/ic_volume_ringer_unlinked.xml | 26 -------------- .../systemui/volume/VolumeDialogImpl.java | 35 ++++++------------- 3 files changed, 11 insertions(+), 84 deletions(-) delete mode 100644 packages/SystemUI/res/drawable/ic_volume_ringer_mute_unlinked.xml delete mode 100644 packages/SystemUI/res/drawable/ic_volume_ringer_unlinked.xml diff --git a/packages/SystemUI/res/drawable/ic_volume_ringer_mute_unlinked.xml b/packages/SystemUI/res/drawable/ic_volume_ringer_mute_unlinked.xml deleted file mode 100644 index 74f30d1a44d2..000000000000 --- a/packages/SystemUI/res/drawable/ic_volume_ringer_mute_unlinked.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - diff --git a/packages/SystemUI/res/drawable/ic_volume_ringer_unlinked.xml b/packages/SystemUI/res/drawable/ic_volume_ringer_unlinked.xml deleted file mode 100644 index 343fe5d4cb69..000000000000 --- a/packages/SystemUI/res/drawable/ic_volume_ringer_unlinked.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - \ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java index 3230b5530689..dddbe1ffb656 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java @@ -796,13 +796,11 @@ public void onViewDetachedFromWindow(View v) { R.drawable.ic_volume_media, R.drawable.ic_volume_media_mute, true, true); if (!AudioSystem.isSingleVolume(mContext)) { if (mSeparateNotification) { - addRow(AudioManager.STREAM_RING, R.drawable.ic_volume_ringer_unlinked, - R.drawable.ic_volume_ringer_mute_unlinked, true, false); - addRow(AudioManager.STREAM_NOTIFICATION, R.drawable.ic_volume_ringer, - R.drawable.ic_volume_ringer_mute, true, false); + addRow(AudioManager.STREAM_RING, R.drawable.ic_ring_volume, + R.drawable.ic_ring_volume_off, true, false); } else { addRow(AudioManager.STREAM_RING, R.drawable.ic_volume_ringer, - R.drawable.ic_volume_ringer_mute, true, false); + R.drawable.ic_volume_ringer, true, false); } addRow(STREAM_ALARM, @@ -1806,7 +1804,6 @@ private boolean showActiveStreamOnly() { private boolean isExpandableRowH(VolumeRow row) { return row != null && row != mDefaultRow && !row.defaultStream && (row.stream == STREAM_RING - || row.stream == STREAM_NOTIFICATION || row.stream == STREAM_ALARM || row.stream == STREAM_MUSIC); } @@ -2196,29 +2193,21 @@ private void updateVolumeRowH(VolumeRow row) { 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 isNotificationStream = row.stream == STREAM_NOTIFICATION; final boolean isSystemStream = row.stream == AudioManager.STREAM_SYSTEM; final boolean isAlarmStream = row.stream == STREAM_ALARM; final boolean isMusicStream = row.stream == AudioManager.STREAM_MUSIC; final boolean isRingVibrate = isRingStream && mState.ringerModeInternal == AudioManager.RINGER_MODE_VIBRATE; - final boolean isNotificationVibrate = isNotificationStream - && mState.ringerModeInternal == AudioManager.RINGER_MODE_VIBRATE; final boolean isRingSilent = isRingStream && mState.ringerModeInternal == AudioManager.RINGER_MODE_SILENT; - final boolean isNotificationSilentByPolicy = isNotificationStream - && mState.ringerModeInternal == AudioManager.RINGER_MODE_SILENT; final boolean isZenPriorityOnly = mState.zenMode == Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; final boolean isZenAlarms = mState.zenMode == Global.ZEN_MODE_ALARMS; final boolean isZenNone = mState.zenMode == Global.ZEN_MODE_NO_INTERRUPTIONS; - final boolean zenMuted = isZenAlarms ? (isRingStream || isNotificationStream - || isSystemStream) - : isZenNone ? (isRingStream || isNotificationStream || isSystemStream - || isAlarmStream || isMusicStream) + final boolean zenMuted = isZenAlarms ? (isRingStream || isSystemStream) + : isZenNone ? (isRingStream || isSystemStream || isAlarmStream || isMusicStream) : isZenPriorityOnly ? ((isAlarmStream && mState.disallowAlarms) || (isMusicStream && mState.disallowMedia) || (isRingStream && mState.disallowRinger) || - (isNotificationStream && mState.disallowRinger) || (isSystemStream && mState.disallowSystem)) : false; @@ -2241,10 +2230,9 @@ private void updateVolumeRowH(VolumeRow row) { // update icon final boolean iconEnabled = (mAutomute || ss.muteSupported) && !zenMuted; final int iconRes; - if (isRingVibrate || isNotificationVibrate) { + if (isRingVibrate) { iconRes = R.drawable.ic_volume_ringer_vibrate; - } else if (isRingSilent || isNotificationSilentByPolicy - || isNotificationStream && isStreamMuted(ss) || zenMuted) { + } else if (isRingSilent || zenMuted) { iconRes = row.iconMuteRes; } else if (ss.routedToBluetooth) { if (isVoiceCallStream) { @@ -2312,16 +2300,15 @@ private void updateVolumeRowH(VolumeRow row) { } } - // ensure tracking is disabled if zenMuted or the ringer mode was set to silent/vibrate - if (zenMuted || isNotificationVibrate || isNotificationSilentByPolicy) { + // ensure tracking is disabled if zenMuted + if (zenMuted) { row.tracking = false; } enableVolumeRowViewsH(row, !zenMuted); // update slider - final boolean enableSlider = - !zenMuted && !isNotificationVibrate && !isNotificationSilentByPolicy; - final int vlevel = row.ss.muted && (!isRingStream && !isNotificationStream && !zenMuted) ? 0 + final boolean enableSlider = !zenMuted; + final int vlevel = row.ss.muted && (!isRingStream && !zenMuted) ? 0 : row.ss.level; Trace.beginSection("VolumeDialogImpl#updateVolumeRowSliderH"); updateVolumeRowSliderH(row, enableSlider, vlevel);