Merge "Issue 3371080: fix VolumePanel in mute state" into honeycomb

2011-02-03 19:35:57 -08:00
parent 0d47ac1176 d72d51c77a
commit e6955f8e38
1 changed files with 4 additions and 1 deletions
--- 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;