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

Commit ddedb890 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Fixing a bug that when an app is dismissed or loaded that changes the... 

Merge "Fixing a bug that when an app is dismissed or loaded that changes the current active audio stream, if the volume overlay is visible during the swap, if you adjust the volume (with hard keys) after the steam has changed while the panel is still visible, the wrong panel (view) is still visible on-top of the one that is being adjusted." into ics
parents 30456e9d 792bdc51

core/java/android/view/VolumePanel.java

+4 −1
Original line number Diff line number Diff line
@@ -400,7 +400,10 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie 
        if (LOGD) Log.d(TAG, "onVolumeChanged(streamType: " + streamType + ", flags: " + flags + ")");



        if ((flags & AudioManager.FLAG_SHOW_UI) != 0) {

            if (mActiveStreamType == -1) {

            // If the activePanel is none - or - the one we are updating is not the current active panel

            // then it is likely that the audio stream being updated has been swapped by an app

            // we need to reorder the sliders to bring the new active one to the front

            if (mActiveStreamType == -1 || streamType != mActiveStreamType) {

                reorderSliders(streamType);

            }

            onShowVolumeChanged(streamType, flags);