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

Commit 2357da95 authored by Daria Evdokimova's avatar Daria Evdokimova Committed by Android (Google) Code Review
Browse files

Merge "Change DISMISS window from 2 hours to 24 hours" into ub-deskclock-business

parents 4327c0b2 97a4d2c3

src/com/android/deskclock/HandleApiCalls.java

+3 −4
Original line number Diff line number Diff line
@@ -106,13 +106,12 @@ public class HandleApiCalls extends Activity { 
            return;

        }



        if (Utils.isAlarmWithinTwoHours(alarmInstance)) {

        if (Utils.isAlarmWithin24Hours(alarmInstance)) {

            AlarmStateManager.setPreDismissState(context, alarmInstance);

            LogUtils.i("Dismiss %d:%d",alarm.hour, alarm.minutes);

            Events.sendAlarmEvent(R.string.action_dismiss,

                    R.string.label_voice);

            Events.sendAlarmEvent(R.string.action_dismiss, R.string.label_voice);

        } else {

            LogUtils.i("%s wasn't dismissed, still more than two hours away.", alarm);

            LogUtils.i("%s wasn't dismissed, still more than 24 hours away.", alarm);

        }

    }

src/com/android/deskclock/Utils.java

+2 −4
Original line number Diff line number Diff line
@@ -491,12 +491,10 @@ public class Utils { 
        return timeString;

    }



    public static boolean isAlarmWithinTwoHours(AlarmInstance alarmInstance) {

    public static boolean isAlarmWithin24Hours(AlarmInstance alarmInstance) {

        final Calendar nextAlarmTime = alarmInstance.getAlarmTime();

        final long nextAlarmTimeMillis = nextAlarmTime.getTimeInMillis();

        final long twoHours = -AlarmInstance.LOW_NOTIFICATION_HOUR_OFFSET *

                DateUtils.HOUR_IN_MILLIS;

        return nextAlarmTimeMillis - System.currentTimeMillis() <= twoHours;

        return nextAlarmTimeMillis - System.currentTimeMillis() <= DateUtils.DAY_IN_MILLIS;

    }



    /** Clock views can call this to refresh their alarm to the next upcoming value. **/