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

Commit 72d19f46 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "Zen: Show subhead for Indefinitely." into lmp-dev

parents e87457f1 89fe1cb9

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

+1 −3
Original line number Diff line number Diff line
@@ -284,14 +284,12 @@ public class ZenModePanel extends LinearLayout { 
        final boolean zenOff = zen == Global.ZEN_MODE_OFF;

        final boolean zenImportant = zen == Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;

        final boolean zenNone = zen == Global.ZEN_MODE_NO_INTERRUPTIONS;

        final boolean foreverSelected = mExitConditionId == null;

        final boolean hasNextAlarm = mNextAlarm != 0;

        final boolean expanded = !mHidden && mExpanded;

        final boolean showAlarmWarning = zenNone && expanded && hasNextAlarm;



        mZenButtons.setVisibility(mHidden ? GONE : VISIBLE);

        mZenSubhead.setVisibility(!mHidden && !zenOff && (expanded || !foreverSelected) ? VISIBLE

                : GONE);

        mZenSubhead.setVisibility(!mHidden && !zenOff ? VISIBLE : GONE);

        mZenSubheadExpanded.setVisibility(expanded ? VISIBLE : GONE);

        mZenSubheadCollapsed.setVisibility(!expanded ? VISIBLE : GONE);

        mMoreSettings.setVisibility(zenImportant && expanded ? VISIBLE : GONE);