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

Commit 79511838 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am ec96305e: am 559167f3: Merge "Volume Overlay Bug When swapping streams" 

* commit 'ec96305e':
  Volume Overlay Bug When swapping streams
parents 7eda9de1 ec96305e

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