Merge "Fix mute icon for streams routed to bluetooth" (5d075030) · Commits · e / os / android_frameworks_base

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

+9 −6

Original line number	Diff line number	Diff line
		@@ -1021,11 +1021,10 @@ public class VolumeDialogImpl implements VolumeDialog,
		final int iconRes =
		isRingVibrate ? R.drawable.ic_volume_ringer_vibrate
		: isRingSilent \|\| zenMuted ? row.iconMuteRes
		: ss.routedToBluetooth ?
		(ss.muted ? R.drawable.ic_volume_media_bt_mute
		: R.drawable.ic_volume_media_bt)
		: mAutomute && ss.level == 0 ? row.iconMuteRes
		: (ss.muted ? row.iconMuteRes : row.iconRes);
		: ss.routedToBluetooth
		? isStreamMuted(ss) ? R.drawable.ic_volume_media_bt_mute
		: R.drawable.ic_volume_media_bt
		: isStreamMuted(ss) ? row.iconMuteRes : row.iconRes;
		row.icon.setImageResource(iconRes);
		row.iconState =
		iconRes == R.drawable.ic_volume_ringer_vibrate ? Events.ICON_STATE_VIBRATE
		@@ -1087,6 +1086,10 @@ public class VolumeDialogImpl implements VolumeDialog,
		updateVolumeRowSliderH(row, enableSlider, vlevel);
		}

		private boolean isStreamMuted(final StreamState streamState) {
		return (mAutomute && streamState.level == 0) \|\| streamState.muted;
		}

		private void updateVolumeRowTintH(VolumeRow row, boolean isActive) {
		if (isActive) {
		row.slider.requestFocus();