diff options
| author | John Spurlock <jspurlock@google.com> | 2014-08-05 22:52:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-05 00:35:13 +0000 |
| commit | 5f72e168471827b48700d791d6f10b0e53bb18fb (patch) | |
| tree | 9f39e50a4ef6e18494b97843b678dffd60ae7d50 /packages/SystemUI/src | |
| parent | f99f320dc79e290a89d668243b6d77c3442b36ab (diff) | |
| parent | 4f0f120316cfcee5880191264885772677fff921 (diff) | |
| download | frameworks_base-5f72e168471827b48700d791d6f10b0e53bb18fb.zip frameworks_base-5f72e168471827b48700d791d6f10b0e53bb18fb.tar.gz frameworks_base-5f72e168471827b48700d791d6f10b0e53bb18fb.tar.bz2 | |
Merge "AudioService: getMasterStreamType -> RING on tablets." into lmp-dev
Diffstat (limited to 'packages/SystemUI/src')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java index 984a5f4..d202036 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java @@ -680,15 +680,15 @@ public class VolumePanel extends Handler { // never disable touch interactions for remote playback, the muting is not tied to // the state of the phone. sc.seekbarView.setEnabled(!fixedVolume); - } else if (fixedVolume || - (sc.streamType != mAudioManager.getMasterStreamType() && muted) || - (sSafetyWarning != null)) { - sc.seekbarView.setEnabled(false); } else if (isRinger && mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_SILENT) { sc.seekbarView.setEnabled(false); sc.icon.setEnabled(false); sc.icon.setAlpha(mDisabledAlpha); sc.icon.setClickable(false); + } else if (fixedVolume || + (sc.streamType != mAudioManager.getMasterStreamType() && muted) || + (sSafetyWarning != null)) { + sc.seekbarView.setEnabled(false); } else { sc.seekbarView.setEnabled(true); sc.icon.setEnabled(true); |