diff options
| author | 2013-08-29 17:52:31 +0000 | |
|---|---|---|
| committer | 2013-08-29 17:52:32 +0000 | |
| commit | 1d04b640ec97e31b8d4fbef134a5b7f083eac9b7 (patch) | |
| tree | d5bbcf1cb8213641f4f39f3ce18f45610659805e | |
| parent | 4b2993123bf9a1c56d0a16b032612834dd418520 (diff) | |
| parent | 2f7acd19be68e596d84246451de2295dbbd40404 (diff) | |
Merge "Add ACTION_SHOW_ALARMS to Clock API" into klp-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/AlarmClock.java | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 0418cd93ac1e..ccd06f780db8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -19392,6 +19392,7 @@ package android.provider { ctor public AlarmClock(); 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_SHOW_ALARMS = "android.intent.action.SHOW_ALARMS"; field public static final java.lang.String EXTRA_DAYS = "android.intent.extra.alarm.DAYS"; 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"; diff --git a/core/java/android/provider/AlarmClock.java b/core/java/android/provider/AlarmClock.java index 5e56e934b805..724d76d8bcbd 100644 --- a/core/java/android/provider/AlarmClock.java +++ b/core/java/android/provider/AlarmClock.java @@ -90,6 +90,15 @@ public final class AlarmClock { public static final String ACTION_SET_TIMER = "android.intent.action.SET_TIMER"; /** + * Activity Action: Show the alarms. + * <p> + * This action opens the alarms page. + * </p> + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_SHOW_ALARMS = "android.intent.action.SHOW_ALARMS"; + + /** * Bundle extra: Weekdays for repeating alarm. * <p> * Used by {@link #ACTION_SET_ALARM}. |