Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd5f6e94 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

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

parents 96d4aadb 5edde5f1

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

+3 −2
Original line number Diff line number Diff line
@@ -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;