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

Commit b889b546 authored by Isaac Katzenelson's avatar Isaac Katzenelson Committed by Android Git Automerger
Browse files

am 18f590a9: Merge "Remove EXTRA_DELETE_AFTER_USE and update descriptions... 

am 18f590a9: Merge "Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly." into klp-dev

* commit '18f590a9':
  Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly.
parents 529763b6 18f590a9

api/current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -19393,7 +19393,6 @@ package android.provider { 
    field public static final java.lang.String ACTION_SET_ALARM = "android.intent.action.SET_ALARM";

    field public static final java.lang.String ACTION_SET_ALARM = "android.intent.action.SET_ALARM";

    field public static final java.lang.String ACTION_SET_TIMER = "android.intent.action.SET_TIMER";

    field public static final java.lang.String ACTION_SET_TIMER = "android.intent.action.SET_TIMER";

    field public static final java.lang.String EXTRA_DAYS = "android.intent.extra.alarm.DAYS";

    field public static final java.lang.String EXTRA_DAYS = "android.intent.extra.alarm.DAYS";

    field public static final java.lang.String EXTRA_DELETE_AFTER_USE = "android.intent.extra.alarm.DELETE_AFTER_USE";

    field public static final java.lang.String EXTRA_HOUR = "android.intent.extra.alarm.HOUR";

    field public static final java.lang.String EXTRA_HOUR = "android.intent.extra.alarm.HOUR";

    field public static final java.lang.String EXTRA_LENGTH = "android.intent.extra.alarm.LENGTH";

    field public static final java.lang.String EXTRA_LENGTH = "android.intent.extra.alarm.LENGTH";

    field public static final java.lang.String EXTRA_MESSAGE = "android.intent.extra.alarm.MESSAGE";

    field public static final java.lang.String EXTRA_MESSAGE = "android.intent.extra.alarm.MESSAGE";

core/java/android/provider/AlarmClock.java

+17 −35
Original line number Original line Diff line number Diff line
@@ -36,10 +36,15 @@ public final class AlarmClock { 
     * <p>

     * <p>

     * Activates an existing alarm or creates a new one.

     * Activates an existing alarm or creates a new one.

     * </p><p>

     * </p><p>

     * This action requests an alarm to be set for a given time of day. If an alarm already

     * This action requests an alarm to be set for a given time of day. If no time of day is

     * exists for this time, an implementation may use it rather than create a new one. If no time

     * specified, an implementation should start an activity that is capable of setting an alarm

     * of day is specified, the implementation should start an activity that is capable of setting

     * ({@link #EXTRA_SKIP_UI} is ignored in this case). If a time of day is specified, and

     * an alarm (SKIP_UI is ignored in this case). This action always enables the alarm.

     * {@link #EXTRA_SKIP_UI} is {@code true}, and the alarm is not repeating, the implementation

     * should remove this alarm after it has been dismissed. If an identical alarm exists matching

     * all parameters, the implementation may re-use it instead of creating a new one (in this case,

     * the alarm should not be removed after dismissal).

     *

     * This action always enables the alarm.

     * </p>

     * </p>

     * <h3>Request parameters</h3>

     * <h3>Request parameters</h3>

     * <ul>

     * <ul>
@@ -52,8 +57,6 @@ public final class AlarmClock { 
     * vibrator for this alarm.

     * vibrator for this alarm.

     * <li>{@link #EXTRA_SKIP_UI} <em>(optional)</em>: Whether or not to display an activity for

     * <li>{@link #EXTRA_SKIP_UI} <em>(optional)</em>: Whether or not to display an activity for

     * setting this alarm.

     * setting this alarm.

     * <li>{@link #EXTRA_DELETE_AFTER_USE} <em>(optional)</em>: Whether or not to delete this

     * alarm after it is dismissed.

     * </ul>

     * </ul>

     */

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
@@ -65,13 +68,14 @@ public final class AlarmClock { 
     * Activates an existing timer or creates a new one.

     * Activates an existing timer or creates a new one.

     * </p><p>

     * </p><p>

     * This action requests a timer to be started for a specific {@link #EXTRA_LENGTH length} of

     * This action requests a timer to be started for a specific {@link #EXTRA_LENGTH length} of

     * time. If a timer already exists for this {@link #EXTRA_LENGTH length}, an implementation may

     * time. If no {@link #EXTRA_LENGTH length} is specified, the implementation should start an

     * use it rather than create a new one. If no {@link #EXTRA_LENGTH length} is specified, the

     * activity that is capable of setting a timer ({@link #EXTRA_SKIP_UI} is ignored in this case).

     * implementation should start an activity that is capable of setting a timer

     * If a {@link #EXTRA_LENGTH length} is specified, and {@link #EXTRA_SKIP_UI} is {@code true},

     * ({@link #EXTRA_SKIP_UI} is ignored in this case).

     * the implementation should remove this timer after it has been dismissed. If an identical,

     * </p><p>

     * unused timer exists matching both parameters, an implementation may re-use it instead of

     * An existing timer should only be used if it matches the provided extras and is not currently

     * creating a new one (in this case, the timer should not be removed after dismissal).

     * in use.

     *

     * This action always starts the timer.

     * </p>

     * </p>

     *

     *

     * <h3>Request parameters</h3>

     * <h3>Request parameters</h3>
@@ -80,8 +84,6 @@ public final class AlarmClock { 
     * <li>{@link #EXTRA_MESSAGE} <em>(optional)</em>: A custom message for the timer.

     * <li>{@link #EXTRA_MESSAGE} <em>(optional)</em>: A custom message for the timer.

     * <li>{@link #EXTRA_SKIP_UI} <em>(optional)</em>: Whether or not to display an activity for

     * <li>{@link #EXTRA_SKIP_UI} <em>(optional)</em>: Whether or not to display an activity for

     * setting this timer.

     * setting this timer.

     * <li>{@link #EXTRA_DELETE_AFTER_USE} <em>(optional)</em>: Whether or not to delete this

     * timer after it is dismissed.

     * </ul>

     * </ul>

     */

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
@@ -103,29 +105,9 @@ public final class AlarmClock { 
     * <li> {@link java.util.Calendar#FRIDAY},

     * <li> {@link java.util.Calendar#FRIDAY},

     * <li> {@link java.util.Calendar#SATURDAY}

     * <li> {@link java.util.Calendar#SATURDAY}

     * </ul>

     * </ul>

     * <p>

     * Note: If this extra is provided, {@link #EXTRA_DELETE_AFTER_USE} is ignored.

     * </p>

     */

     */

    public static final String EXTRA_DAYS = "android.intent.extra.alarm.DAYS";

    public static final String EXTRA_DAYS = "android.intent.extra.alarm.DAYS";





    /**

     * Bundle extra: Whether or not to delete this alarm/timer after it's dismissed.

     * <p>

     * Used by {@link #ACTION_SET_ALARM} and {@link #ACTION_SET_TIMER}.

     * </p><p>

     * If this value is true, the alarm/timer used by this action should be deleted after it's been

     * dismissed. The alarm/timer should only be removed if was actually created by the action. If

     * an existing alarm/timer was used, it should not be deleted after it's dismissed.

     * </p><p>

     * The value is a {@link Boolean}.

     * </p>

     *

     * @see #ACTION_SET_ALARM

     * @see #ACTION_SET_TIMER

     */

    public static final String EXTRA_DELETE_AFTER_USE = "android.intent.extra.alarm.DELETE_AFTER_USE";



    /**

    /**

     * Bundle extra: The hour of the alarm.

     * Bundle extra: The hour of the alarm.

     * <p>

     * <p>