From e28c94f98e648f9453cdce2792e54e8e91da2f28 Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Tue, 19 Sep 2017 14:56:58 -0400
Subject: [PATCH] DND alert info set to INVISIBLE (not GONE) to retain
 formatting.

Change-Id: I182aed5f48d4c2a935a7bfbb9a240046b27dea58
Fixes: 64688590
Test: Manual based on repro steps
---
 .../src/com/android/systemui/volume/ZenModePanel.java      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
index a3aca6e1b6498..7bb987ca7cf01 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
@@ -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() {