Merge "Volume: Ensure ring/notif slider is enabled when ringer=vibrate." into lmp-mr1-dev

2014-11-19 17:19:12 +00:00
parent 9792edd17c 5eb21f3466
commit 2ee054b4f0
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
@@ -793,7 +793,7 @@ public class VolumePanel extends Handler implements DemoMode {
            sc.icon.setAlpha(mDisabledAlpha);
            sc.icon.setClickable(false);
        } else if (fixedVolume ||
-                (sc.streamType != mAudioManager.getMasterStreamType() && muted) ||
+                (sc.streamType != mAudioManager.getMasterStreamType() && !isRinger && muted) ||
                (sSafetyWarning != null)) {
            sc.seekbarView.setEnabled(false);
        } else {