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

* commit '559167f31de1a1a7138dbc2d5a7797e5b7cd59b0':
  Volume Overlay Bug When swapping streams
This commit is contained in:
Dianne Hackborn
2012-04-18 20:39:34 -07:00
committed by Android Git Automerger

View File

@@ -400,7 +400,10 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie
if (LOGD) Log.d(TAG, "onVolumeChanged(streamType: " + streamType + ", flags: " + flags + ")"); if (LOGD) Log.d(TAG, "onVolumeChanged(streamType: " + streamType + ", flags: " + flags + ")");
if ((flags & AudioManager.FLAG_SHOW_UI) != 0) { 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); reorderSliders(streamType);
} }
onShowVolumeChanged(streamType, flags); onShowVolumeChanged(streamType, flags);