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

Commit c884821c 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 

am: d363e453

Change-Id: Ib78559f567c89489187c945535345c3ab9930972
parents a7243a07 d363e453

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -714,6 +714,7 @@ public class VolumeDialogImpl implements VolumeDialog, TunerService.Tunable { 
        final boolean visible = mState.zenMode != Global.ZEN_MODE_OFF

        final boolean visible = mState.zenMode != Global.ZEN_MODE_OFF

                && (mAudioManager.isStreamAffectedByRingerMode(mActiveStream) || mExpanded)

                && (mAudioManager.isStreamAffectedByRingerMode(mActiveStream) || mExpanded)

                && !mZenPanel.isEditing();

                && !mZenPanel.isEditing();



        TransitionManager.beginDelayedTransition(mDialogView, getTransition());

        TransitionManager.beginDelayedTransition(mDialogView, getTransition());

        if (wasVisible != visible && !visible) {

        if (wasVisible != visible && !visible) {

            prepareForCollapse();

            prepareForCollapse();
@@ -841,6 +842,11 @@ public class VolumeDialogImpl implements VolumeDialog, TunerService.Tunable { 
            row.icon.setContentDescription(getStreamLabelH(ss));

            row.icon.setContentDescription(getStreamLabelH(ss));

        }

        }





        // ensure tracking is disabled if zenMuted

        if (zenMuted) {

            row.tracking = false;

        }



        // update slider

        // update slider

        final boolean enableSlider = !zenMuted;

        final boolean enableSlider = !zenMuted;

        final int vlevel = row.ss.muted && (!isRingStream && !zenMuted) ? 0

        final int vlevel = row.ss.muted && (!isRingStream && !zenMuted) ? 0