diff options
| author | Eric Laurent <elaurent@google.com> | 2011-02-07 11:40:51 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-07 11:40:51 -0800 |
| commit | ced2c59678768116e2726f75fc433520e437085a (patch) | |
| tree | f3b5825ddc30a627b8eac7c8c5251a4d01aae023 /core/java/android/view | |
| parent | f44ca4664fe882ead98003d8742aca3d5b8ff571 (diff) | |
| parent | a37a81d705bd9abaf1110fecd176a74d32ac2016 (diff) | |
| download | frameworks_base-ced2c59678768116e2726f75fc433520e437085a.zip frameworks_base-ced2c59678768116e2726f75fc433520e437085a.tar.gz frameworks_base-ced2c59678768116e2726f75fc433520e437085a.tar.bz2 | |
am a37a81d7: am e6955f8e: Merge "Issue 3371080: fix VolumePanel in mute state" into honeycomb
* commit 'a37a81d705bd9abaf1110fecd176a74d32ac2016':
Issue 3371080: fix VolumePanel in mute state
Diffstat (limited to 'core/java/android/view')
| -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 bb5774f..2aa94dc 100644 --- a/core/java/android/view/VolumePanel.java +++ b/core/java/android/view/VolumePanel.java @@ -367,7 +367,10 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie } protected void onShowVolumeChanged(int streamType, int flags) { - int index = mAudioService.getStreamVolume(streamType); + int index = mAudioService.isStreamMute(streamType) ? + mAudioService.getLastAudibleStreamVolume(streamType) + : mAudioService.getStreamVolume(streamType); + // int message = UNKNOWN_VOLUME_TEXT; // int additionalMessage = 0; mRingIsSilent = false; |