diff options
| author | John Spurlock <jspurlock@google.com> | 2014-11-19 11:54:53 -0500 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2014-11-19 11:54:53 -0500 |
| commit | 5eb21f3466ed3fc8c289b2c702269fb5485e8fde (patch) | |
| tree | 2507025cf9f274521f489e849071450461cbf274 /packages/SystemUI/src/com/android/systemui/volume | |
| parent | 0925db87150300a679090a41f6eec26aad5c75e5 (diff) | |
| download | frameworks_base-5eb21f3466ed3fc8c289b2c702269fb5485e8fde.zip frameworks_base-5eb21f3466ed3fc8c289b2c702269fb5485e8fde.tar.gz frameworks_base-5eb21f3466ed3fc8c289b2c702269fb5485e8fde.tar.bz2 | |
Volume: Ensure ring/notif slider is enabled when ringer=vibrate.
Although the audio policy makes a distinction between voice capable
and not when determining the default active stream, have the panel
recognize this condition and behave the same way (enable the slider)
on all devices.
Bug: 17405530
Change-Id: If3e1af3078f47bc1205545e919ccc6206020e7b2
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/volume')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java index f12053c..351911c 100644 --- 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 { |