Commit 2810d2dd authored Dec 27, 2015 by Evan Anderson Committed by Gerrit Code Review Jan 02, 2016

ZenModePanel: Fix until next alarm missing from do not disturb



Roll only modifies the value of the specified calendar
parameter, causing the until next alarm option to disappear
7 days before each month transition. Use add instead to
move the calendar month and year forward as necessary.

Change-Id: Ic8107af2a8fe71527975c608a12c68dd8a0688a5
Signed-off-by: Evan Anderson <evananderson@aospa.co>

parent 9500061a

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -511,7 +511,7 @@ public class ZenModePanel extends LinearLayout {
		GregorianCalendar weekRange = new GregorianCalendar();
		final long now = weekRange.getTimeInMillis();
		setToMidnight(weekRange);
		weekRange.roll(Calendar.DATE, 6);
		weekRange.add(Calendar.DATE, 6);
		final long nextAlarmMs = mController.getNextAlarm();
		if (nextAlarmMs > 0) {
		GregorianCalendar nextAlarm = new GregorianCalendar();