From 229ba4974bc7ba7966837842b239d5ca45096491 Mon Sep 17 00:00:00 2001 From: Sam Blitzstein Date: Wed, 28 Aug 2013 11:42:05 -0700 Subject: [PATCH] Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly. As per UX, we're removing the EXTRA_DELETE_AFTER_USE flag. Instead, apps that pick up these intents should automatically delete alarms and timers, unless the user is taken into the app to explicicitly specify the time/length. Change-Id: Ibd582788c04e121427467f6549759c8b7706df8c --- api/current.txt | 1 - core/java/android/provider/AlarmClock.java | 52 +++++++--------------- 2 files changed, 17 insertions(+), 36 deletions(-) diff --git a/api/current.txt b/api/current.txt index 4b66d086b2cb1..14463a8bd76d2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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_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_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_LENGTH = "android.intent.extra.alarm.LENGTH"; field public static final java.lang.String EXTRA_MESSAGE = "android.intent.extra.alarm.MESSAGE"; diff --git a/core/java/android/provider/AlarmClock.java b/core/java/android/provider/AlarmClock.java index f3267ee233b35..5e56e934b8052 100644 --- a/core/java/android/provider/AlarmClock.java +++ b/core/java/android/provider/AlarmClock.java @@ -36,10 +36,15 @@ public final class AlarmClock { *

* Activates an existing alarm or creates a new one. *

- * This action requests an alarm to be set for a given time of day. If an alarm already - * exists for this time, an implementation may use it rather than create a new one. If no time - * of day is specified, the implementation should start an activity that is capable of setting - * an alarm (SKIP_UI is ignored in this case). This action always enables the alarm. + * This action requests an alarm to be set for a given time of day. If no time of day is + * specified, an implementation should start an activity that is capable of setting an alarm + * ({@link #EXTRA_SKIP_UI} is ignored in this case). If a time of day is specified, and + * {@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. *

*

Request parameters

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

* 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 - * use it rather than create a new one. If no {@link #EXTRA_LENGTH length} is specified, the - * implementation should start an activity that is capable of setting a timer - * ({@link #EXTRA_SKIP_UI} is ignored in this case). - *

- * An existing timer should only be used if it matches the provided extras and is not currently - * in use. + * time. If no {@link #EXTRA_LENGTH length} is specified, the implementation should start an + * activity that is capable of setting a timer ({@link #EXTRA_SKIP_UI} is ignored in this case). + * If a {@link #EXTRA_LENGTH length} is specified, and {@link #EXTRA_SKIP_UI} is {@code true}, + * the implementation should remove this timer after it has been dismissed. If an identical, + * unused timer exists matching both parameters, an implementation may re-use it instead of + * creating a new one (in this case, the timer should not be removed after dismissal). + * + * This action always starts the timer. *

* *

Request parameters

@@ -80,8 +84,6 @@ public final class AlarmClock { *
  • {@link #EXTRA_MESSAGE} (optional): A custom message for the timer. *
  • {@link #EXTRA_SKIP_UI} (optional): Whether or not to display an activity for * setting this timer. - *
  • {@link #EXTRA_DELETE_AFTER_USE} (optional): Whether or not to delete this - * timer after it is dismissed. * */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) @@ -103,29 +105,9 @@ public final class AlarmClock { *
  • {@link java.util.Calendar#FRIDAY}, *
  • {@link java.util.Calendar#SATURDAY} * - *

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

    */ 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. - *

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

    - * 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. - *

    - * The value is a {@link Boolean}. - *

    - * - * @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. *