VolumeDialogImpl: Add STREAM_NOTIFICATION row (c16192c4) · Commits · e / os / android_frameworks_base

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -1902,6 +1902,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);
		}
		@@ -2308,6 +2309,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;
		@@ -2315,6 +2317,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;
		@@ -2349,7 +2352,7 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable,
		iconRes = com.android.internal.R.drawable.ic_qs_dnd;
		} else if (isRingVibrate) {
		iconRes = R.drawable.ic_legacy_volume_ringer_vibrate;
		} else if (isRingSilent) {
		} else if (isRingSilent \|\| isNotificationMuted) {
		iconRes = row.iconMuteRes;
		} else if (ss.routedToBluetooth) {
		if (isVoiceCallStream) {