Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 9548013287

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

Change-Id: Ied3c40add25a0ffa8e766a820e64498e189a7df5
This commit is contained in:
Julia Reynolds
2016-06-02 19:38:59 +00:00
committed by android-build-merger
parent b508d38074 9548013287
commit 30721fb490
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
View File

@@ -504,9 +504,17 @@ public class ZenModePanel extends LinearLayout {
if (mCountdownConditionSupported) { if (mCountdownConditionSupported) {
Condition nextAlarmCondition = getTimeUntilNextAlarmCondition(); Condition nextAlarmCondition = getTimeUntilNextAlarmCondition();
if (nextAlarmCondition != null) { if (nextAlarmCondition != null) {
mZenRadioGroup.getChildAt(
COUNTDOWN_ALARM_CONDITION_INDEX).setVisibility(View.VISIBLE);
mZenRadioGroupContent.getChildAt(
COUNTDOWN_ALARM_CONDITION_INDEX).setVisibility(View.VISIBLE);
bind(nextAlarmCondition, bind(nextAlarmCondition,
mZenRadioGroupContent.getChildAt(COUNTDOWN_ALARM_CONDITION_INDEX), mZenRadioGroupContent.getChildAt(COUNTDOWN_ALARM_CONDITION_INDEX),
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 // ensure something is selected