Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Julia Reynolds
2016-11-15 14:06:35 +00:00
committed by Android (Google) Code Review
parent 96d4aadb4c 5edde5f18a
commit fd5f6e9446
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
View File

@@ -544,8 +544,9 @@ public class ZenModePanel extends LinearLayout {
setToMidnight(nextAlarm); setToMidnight(nextAlarm);
if (weekRange.compareTo(nextAlarm) >= 0) { 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; return null;