Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d363e453 authored by Beverly's avatar Beverly Committed by android-build-merger
Browse files

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

am: 0951dbd0

Change-Id: I0658524b2f0d260ec2dda57f0f44f52cd312fd16
parents d10454ec 0951dbd0

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+6 −0
Original line number Diff line number Diff line
@@ -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