Merge "Fix the Icons in the Expanded Volume Overlay" into jellybean (6099d941) · Commits · e / os / android_frameworks_base

core/java/android/view/VolumePanel.java

+2 −5

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie
		R.string.volume_icon_description_ringer,
		R.drawable.ic_audio_ring_notif,
		R.drawable.ic_audio_ring_notif_mute,
		false),
		true),
		VoiceStream(AudioManager.STREAM_VOICE_CALL,
		R.string.volume_icon_description_incall,
		R.drawable.ic_audio_phone,
		@@ -150,7 +150,7 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie
		R.string.volume_alarm,
		R.drawable.ic_audio_alarm,
		R.drawable.ic_audio_alarm_mute,
		false),
		true),
		MediaStream(AudioManager.STREAM_MUSIC,
		R.string.volume_icon_description_media,
		R.drawable.ic_audio_vol,
		@@ -401,9 +401,6 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie
		for (int i = 0; i < STREAMS.length; i++) {
		StreamResources streamRes = STREAMS[i];
		int streamType = streamRes.streamType;
		if (mVoiceCapable && streamRes == StreamResources.NotificationStream) {
		streamRes = StreamResources.RingerStream;
		}
		StreamControl sc = new StreamControl();
		sc.streamType = streamType;
		sc.group = (ViewGroup) inflater.inflate(R.layout.volume_adjust_item, null);