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

Commit 5312d080 authored by Alon Albert's avatar Alon Albert Committed by Android (Google) Code Review
Browse files

Merge "Add new Reminder Method: Alarm"

parents 41c31ef3 bd251616

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -16080,6 +16080,7 @@ package android.provider { 
  protected static abstract interface CalendarContract.RemindersColumns {

    field public static final java.lang.String EVENT_ID = "event_id";

    field public static final java.lang.String METHOD = "method";

    field public static final int METHOD_ALARM = 4; // 0x4

    field public static final int METHOD_ALERT = 1; // 0x1

    field public static final int METHOD_DEFAULT = 0; // 0x0

    field public static final int METHOD_EMAIL = 2; // 0x2

core/java/android/provider/CalendarContract.java

+8 −7
Original line number Diff line number Diff line
@@ -402,8 +402,8 @@ public final class CalendarContract { 
         * A comma separated list of reminder methods supported for this

         * calendar in the format "#,#,#". Valid types are

         * {@link Reminders#METHOD_DEFAULT}, {@link Reminders#METHOD_ALERT},

         * {@link Reminders#METHOD_EMAIL}, {@link Reminders#METHOD_SMS}. Column

         * name.

         * {@link Reminders#METHOD_EMAIL}, {@link Reminders#METHOD_SMS},

         * {@link Reminders#METHOD_ALARM}. Column name.

         * <P>Type: TEXT</P>

         */

        public static final String ALLOWED_REMINDERS = "allowedReminders";
@@ -1930,11 +1930,11 @@ public final class CalendarContract { 


        /**

         * The alarm method, as set on the server. {@link #METHOD_DEFAULT},

         * {@link #METHOD_ALERT}, {@link #METHOD_EMAIL}, and {@link #METHOD_SMS}

         * are possible values; the device will only process

         * {@link #METHOD_DEFAULT} and {@link #METHOD_ALERT} reminders (the

         * other types are simply stored so we can send the same reminder info

         * back to the server when we make changes).

         * {@link #METHOD_ALERT}, {@link #METHOD_EMAIL}, {@link #METHOD_SMS} and

         * {@link #METHOD_ALARM} are possible values; the device will only

         * process {@link #METHOD_DEFAULT} and {@link #METHOD_ALERT} reminders

         * (the other types are simply stored so we can send the same reminder

         * info back to the server when we make changes).

         */

        public static final String METHOD = "method";
@@ -1942,6 +1942,7 @@ public final class CalendarContract { 
        public static final int METHOD_ALERT = 1;

        public static final int METHOD_EMAIL = 2;

        public static final int METHOD_SMS = 3;

        public static final int METHOD_ALARM = 4;

    }



    /**