Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cf6a5a9 authored by LuK1337's avatar LuK1337 Committed by Łukasz Patron
Browse files

VolumeDialogImpl: Add STREAM_NOTIFICATION row 

Change-Id: Ia851c70871ef561398203b358e8c4b32995f30cd
parent 9fb459b3

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+6 −1
Original line number Diff line number Diff line
@@ -784,6 +784,8 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable, 
                if (mSeparateNotification) {

                    addRow(AudioManager.STREAM_RING, R.drawable.ic_ring_volume,

                            R.drawable.ic_ring_volume_off, true, false);

                    addRow(AudioManager.STREAM_NOTIFICATION, R.drawable.ic_notifications_alert,

                            R.drawable.ic_notifications_silence, true, false);

                } else {

                    addRow(AudioManager.STREAM_RING, R.drawable.ic_volume_ringer,

                            R.drawable.ic_volume_ringer, true, false);
@@ -1772,6 +1774,7 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable, 
    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);

    }
@@ -2161,6 +2164,7 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable, 
        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 == AudioManager.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;
@@ -2168,6 +2172,7 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable, 
                && mState.ringerModeInternal == AudioManager.RINGER_MODE_VIBRATE;

        final boolean isRingSilent = isRingStream

                && mState.ringerModeInternal == AudioManager.RINGER_MODE_SILENT;

        final boolean isNotificationMuted = isNotificationStream && ss.muted;

        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;
@@ -2200,7 +2205,7 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable, 
        final int iconRes;

        if (isRingVibrate) {

            iconRes = R.drawable.ic_volume_ringer_vibrate;

        } else if (isRingSilent || zenMuted) {

        } else if (isRingSilent || isNotificationMuted || zenMuted) {

            iconRes = row.iconMuteRes;

        } else if (ss.routedToBluetooth) {

            if (isVoiceCallStream) {