Remove 'until next alarm'.

am: 5edde5f18a

Change-Id: I0f247f52155f78cefe0d2e850e9d5f1ca65dfb42

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

@@ -547,8 +547,9 @@ public class ZenModePanel extends LinearLayout {
             setToMidnight(nextAlarm);
 
             if (weekRange.compareTo(nextAlarm) >= 0) {
-                return ZenModeConfig.toNextAlarmCondition(mContext, now,
+                return ZenModeConfig.toTimeCondition(mContext, nextAlarmMs,
-                        nextAlarmMs, ActivityManager.getCurrentUser());
+                        Math.round((nextAlarmMs - now) / (float) MINUTES_MS),
+                        ActivityManager.getCurrentUser(), true);
             }
         }
         return null;