Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ced2c596 authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

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

* commit 'a37a81d7':
  Issue 3371080: fix VolumePanel in mute state
parents f44ca466 a37a81d7

core/java/android/view/VolumePanel.java

+4 −1
Original line number Diff line number Diff line
@@ -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;