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

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

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

Change-Id: I16ff49b128224db3972335fd1f4b0aee9a06fcb8
parents 340f22fc 62716a91

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

+8 −0
Original line number Diff line number Diff line
@@ -501,9 +501,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