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

* commit 'e6955f8e38dfe7c0d748c3b55bbcfc5640c968c5':
  Issue 3371080: fix VolumePanel in mute state
This commit is contained in:
Eric Laurent
2011-02-03 19:38:27 -08:00
committed by Android Git Automerger

View File

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