summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider/AlarmClock.java
diff options
context:
space:
mode:
authorIsaac Katzenelson <isaack@android.com>2013-08-29 17:52:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-29 17:52:32 +0000
commit1d04b640ec97e31b8d4fbef134a5b7f083eac9b7 (patch)
treed5bbcf1cb8213641f4f39f3ce18f45610659805e /core/java/android/provider/AlarmClock.java
parent4b2993123bf9a1c56d0a16b032612834dd418520 (diff)
parent2f7acd19be68e596d84246451de2295dbbd40404 (diff)
downloadframeworks_base-1d04b640ec97e31b8d4fbef134a5b7f083eac9b7.zip
frameworks_base-1d04b640ec97e31b8d4fbef134a5b7f083eac9b7.tar.gz
frameworks_base-1d04b640ec97e31b8d4fbef134a5b7f083eac9b7.tar.bz2
Merge "Add ACTION_SHOW_ALARMS to Clock API" into klp-dev
Diffstat (limited to 'core/java/android/provider/AlarmClock.java')
-rw-r--r--core/java/android/provider/AlarmClock.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/provider/AlarmClock.java b/core/java/android/provider/AlarmClock.java
index 5e56e934..724d76d 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}.