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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-20 16:02:46 +00:00
committed by Android (Google) Code Review
parent 36e5c8e7ed e28c94f98e
commit 8e84dfec6a
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -524,18 +524,17 @@ public class ZenModePanel extends FrameLayout {
bindGenericCountdown(); bindGenericCountdown();
bindNextAlarm(getTimeUntilNextAlarmCondition()); bindNextAlarm(getTimeUntilNextAlarmCondition());
} else if (isForever(c)) { } else if (isForever(c)) {
getConditionTagAt(FOREVER_CONDITION_INDEX).rb.setChecked(true); getConditionTagAt(FOREVER_CONDITION_INDEX).rb.setChecked(true);
bindGenericCountdown(); bindGenericCountdown();
bindNextAlarm(getTimeUntilNextAlarmCondition()); bindNextAlarm(getTimeUntilNextAlarmCondition());
} else { } else {
if (isAlarm(c)) { if (isAlarm(c)) {
bindGenericCountdown(); bindGenericCountdown();
bindNextAlarm(c); bindNextAlarm(c);
getConditionTagAt(COUNTDOWN_ALARM_CONDITION_INDEX).rb.setChecked(true); getConditionTagAt(COUNTDOWN_ALARM_CONDITION_INDEX).rb.setChecked(true);
} else if (isCountdown(c)) { } else if (isCountdown(c)) {
bindNextAlarm(getTimeUntilNextAlarmCondition()); bindNextAlarm(getTimeUntilNextAlarmCondition());
bind(c, mZenRadioGroupContent.getChildAt(COUNTDOWN_CONDITION_INDEX), bind(c, mZenRadioGroupContent.getChildAt(COUNTDOWN_CONDITION_INDEX),
COUNTDOWN_CONDITION_INDEX); COUNTDOWN_CONDITION_INDEX);
getConditionTagAt(COUNTDOWN_CONDITION_INDEX).rb.setChecked(true); getConditionTagAt(COUNTDOWN_CONDITION_INDEX).rb.setChecked(true);
@@ -568,8 +567,8 @@ public class ZenModePanel extends FrameLayout {
tag = (ConditionTag) alarmContent.getTag(); tag = (ConditionTag) alarmContent.getTag();
boolean showAlarm = tag != null && tag.condition != null; boolean showAlarm = tag != null && tag.condition != null;
mZenRadioGroup.getChildAt(COUNTDOWN_ALARM_CONDITION_INDEX).setVisibility( mZenRadioGroup.getChildAt(COUNTDOWN_ALARM_CONDITION_INDEX).setVisibility(
showAlarm ? View.VISIBLE : View.GONE); showAlarm ? View.VISIBLE : View.INVISIBLE);
alarmContent.setVisibility(showAlarm ? View.VISIBLE : View.GONE); alarmContent.setVisibility(showAlarm ? View.VISIBLE : View.INVISIBLE);
} }
private Condition forever() { private Condition forever() {