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

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

Merge "DND alert info set to INVISIBLE (not GONE) to retain formatting." into oc-mr1-dev 

am: 8e84dfec

Change-Id: I779fde484505f8fd6e5a19397b670299970320c9
parents 5bd0a222 8e84dfec

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

+3 −4
Original line number Diff line number Diff line
@@ -524,18 +524,17 @@ public class ZenModePanel extends FrameLayout { 
            bindGenericCountdown();

            bindNextAlarm(getTimeUntilNextAlarmCondition());

        } else if (isForever(c)) {



            getConditionTagAt(FOREVER_CONDITION_INDEX).rb.setChecked(true);

            bindGenericCountdown();

            bindNextAlarm(getTimeUntilNextAlarmCondition());

        } else {

            if (isAlarm(c)) {

                bindGenericCountdown();



                bindNextAlarm(c);

                getConditionTagAt(COUNTDOWN_ALARM_CONDITION_INDEX).rb.setChecked(true);

            } else if (isCountdown(c)) {

                bindNextAlarm(getTimeUntilNextAlarmCondition());



                bind(c, mZenRadioGroupContent.getChildAt(COUNTDOWN_CONDITION_INDEX),

                        COUNTDOWN_CONDITION_INDEX);

                getConditionTagAt(COUNTDOWN_CONDITION_INDEX).rb.setChecked(true);
@@ -568,8 +567,8 @@ public class ZenModePanel extends FrameLayout { 
        tag = (ConditionTag) alarmContent.getTag();

        boolean showAlarm = tag != null && tag.condition != null;

        mZenRadioGroup.getChildAt(COUNTDOWN_ALARM_CONDITION_INDEX).setVisibility(

                showAlarm ? View.VISIBLE : View.GONE);

        alarmContent.setVisibility(showAlarm ? View.VISIBLE : View.GONE);

                showAlarm ? View.VISIBLE : View.INVISIBLE);

        alarmContent.setVisibility(showAlarm ? View.VISIBLE : View.INVISIBLE);

    }



    private Condition forever() {