Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '9d48ec7a5c639226f69377d41c4fcb2d3e17c13e':
  Volume: Ensure ring/notif slider is enabled when ringer=vibrate.
This commit is contained in:
John Spurlock
2014-11-19 17:57:25 +00:00
committed by Android Git Automerger
parent 88a080bc68 9d48ec7a5c
commit 34a2ee695d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
View File

@@ -793,7 +793,7 @@ public class VolumePanel extends Handler implements DemoMode {
sc.icon.setAlpha(mDisabledAlpha); sc.icon.setAlpha(mDisabledAlpha);
sc.icon.setClickable(false); sc.icon.setClickable(false);
} else if (fixedVolume || } else if (fixedVolume ||
(sc.streamType != mAudioManager.getMasterStreamType() && muted) || (sc.streamType != mAudioManager.getMasterStreamType() && !isRinger && muted) ||
(sSafetyWarning != null)) { (sSafetyWarning != null)) {
sc.seekbarView.setEnabled(false); sc.seekbarView.setEnabled(false);
} else { } else {