Merge "Remove 'until next alarm'." into nyc-mr2-dev

2016-11-15 14:06:35 +00:00
parent 96d4aadb4c 5edde5f18a
commit fd5f6e9446
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
@@ -544,8 +544,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;