diff options
| author | Dianne Hackborn <hackbod@android.com> | 2012-04-18 20:39:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-04-18 20:39:34 -0700 |
| commit | ec96305ea05355d57fd803edd57d6af1c4a9f83e (patch) | |
| tree | c19b64f1a091e2eb183f8a2a16076fd37164fb12 /core/java/android | |
| parent | 2fe57183d3cbe83737ae81065639ef00f835629a (diff) | |
| parent | 559167f31de1a1a7138dbc2d5a7797e5b7cd59b0 (diff) | |
| download | frameworks_base-ec96305ea05355d57fd803edd57d6af1c4a9f83e.zip frameworks_base-ec96305ea05355d57fd803edd57d6af1c4a9f83e.tar.gz frameworks_base-ec96305ea05355d57fd803edd57d6af1c4a9f83e.tar.bz2 | |
am 559167f3: Merge "Volume Overlay Bug When swapping streams"
* commit '559167f31de1a1a7138dbc2d5a7797e5b7cd59b0':
Volume Overlay Bug When swapping streams
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/VolumePanel.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/view/VolumePanel.java b/core/java/android/view/VolumePanel.java index 48fe0df..1072953 100644 --- a/core/java/android/view/VolumePanel.java +++ b/core/java/android/view/VolumePanel.java @@ -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); |