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

Commit 061fb402 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Hide alarm condition if there\'s no alarm." into nyc-dev am: 62716a91

am: 48347048

* commit '48347048':
  Hide alarm condition if there's no alarm.

Change-Id: I5613d6377b97aa35c6427730da8df643780017f5
parents b508d380 48347048
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -504,9 +504,17 @@ public class ZenModePanel extends LinearLayout {
        if (mCountdownConditionSupported) {
            Condition nextAlarmCondition = getTimeUntilNextAlarmCondition();
            if (nextAlarmCondition != null) {
                mZenRadioGroup.getChildAt(
                        COUNTDOWN_ALARM_CONDITION_INDEX).setVisibility(View.VISIBLE);
                mZenRadioGroupContent.getChildAt(
                        COUNTDOWN_ALARM_CONDITION_INDEX).setVisibility(View.VISIBLE);
                bind(nextAlarmCondition,
                        mZenRadioGroupContent.getChildAt(COUNTDOWN_ALARM_CONDITION_INDEX),
                        COUNTDOWN_ALARM_CONDITION_INDEX);
            } else {
                mZenRadioGroup.getChildAt(COUNTDOWN_ALARM_CONDITION_INDEX).setVisibility(View.GONE);
                mZenRadioGroupContent.getChildAt(
                        COUNTDOWN_ALARM_CONDITION_INDEX).setVisibility(View.GONE);
            }
        }
        // ensure something is selected