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

Commit 6fcabf4b authored by StevenHarperUK's avatar StevenHarperUK
Browse files

Fix the Icons in the Expanded Volume Overlay 

 * Defaulted the Phone Icon to be visible
 * Added the Alarm volume in expanded view
 * Fixed a bug that made the notification icon the same as the phone icon

These changes were made originally by myself in ics

They have been tested on a i9100

Change-Id: I2f4592f96267d80fcc2e5e817e5075e9becc9b06
parent f412f1e8

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);