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

Commit 822c1475 authored by Annie Chin's avatar Annie Chin Committed by Android (Google) Code Review
Browse files

Merge "Also show preemptive dismiss for alarm in HIDE_NOTIFICATION state." into ub-deskclock-charm

parents bd9eae10 4c9234c4

src/com/android/deskclock/provider/Alarm.java

+3 −2
Original line number Diff line number Diff line
@@ -308,12 +308,13 @@ public final class Alarm implements Parcelable, ClockContract.AlarmsColumns { 


    /**

     * Whether the alarm is in a state to show preemptive dismiss. Valid states are SNOOZE_STATE

     * HIGH_NOTIFICATION, and LOW_NOTIFICATION. TODO: firing state?

     * HIGH_NOTIFICATION, LOW_NOTIFICATION, and HIDE_NOTIFICATION.

     */

    public boolean canPreemptivelyDismiss() {

        return instanceState == AlarmInstance.SNOOZE_STATE

                || instanceState == AlarmInstance.HIGH_NOTIFICATION_STATE

                || instanceState == AlarmInstance.LOW_NOTIFICATION_STATE;

                || instanceState == AlarmInstance.LOW_NOTIFICATION_STATE

                || instanceState == AlarmInstance.HIDE_NOTIFICATION_STATE;

    }



    public void writeToParcel(Parcel p, int flags) {