Remove 'until next alarm'.

am: 5edde5f18a Change-Id: I0f247f52155f78cefe0d2e850e9d5f1ca65dfb42
2016-11-15 14:13:18 +00:00
parent 6966f450a2 5edde5f18a
commit 177a976a69
1 changed files with 3 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
+++ b/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,
-                        nextAlarmMs, ActivityManager.getCurrentUser());
+                return ZenModeConfig.toTimeCondition(mContext, nextAlarmMs,
+                        Math.round((nextAlarmMs - now) / (float) MINUTES_MS),
+                        ActivityManager.getCurrentUser(), true);
            }
        }
        return null;