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

Merge "Volume dialog touch-tracking is disabled when in zenMute." into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-22 23:01:21 +00:00
committed by Android (Google) Code Review
parent e4de49140d e421abe1da
commit 0951dbd00d
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
View File

@@ -713,6 +713,7 @@ public class VolumeDialogImpl implements VolumeDialog, TunerService.Tunable {
final boolean visible = mState.zenMode != Global.ZEN_MODE_OFF
&& (mAudioManager.isStreamAffectedByRingerMode(mActiveStream) || mExpanded)
&& !mZenPanel.isEditing();
TransitionManager.beginDelayedTransition(mDialogView, getTransition());
if (wasVisible != visible && !visible) {
prepareForCollapse();
@@ -840,6 +841,11 @@ public class VolumeDialogImpl implements VolumeDialog, TunerService.Tunable {
row.icon.setContentDescription(getStreamLabelH(ss));
}
// ensure tracking is disabled if zenMuted
if (zenMuted) {
row.tracking = false;
}
// update slider
final boolean enableSlider = !zenMuted;
final int vlevel = row.ss.muted && (!isRingStream && !zenMuted) ? 0