diff options
| author | 2016-12-05 14:05:03 -0800 | |
|---|---|---|
| committer | 2017-01-10 16:16:29 +0000 | |
| commit | 1ba3ac92818701c89e031e40215d89cad38cbc34 (patch) | |
| tree | db0699e173fee2a1db7aa151cdb8aed0d8800c09 | |
| parent | 955da4804e7cc940e7aed93cb2ab1774e5f1cb03 (diff) | |
Add AlarmClock#SHOW_TIMERS
Test: run cts -m CtsContentTestCases
Bug: 31228110
Change-Id: Ia291a890b83996d6edf7b75afa52e44557a9117b
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/AlarmClock.java | 9 |
4 files changed, 12 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 52135edb4320..251862772192 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30936,6 +30936,7 @@ 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 ACTION_SHOW_ALARMS = "android.intent.action.SHOW_ALARMS"; + field public static final java.lang.String ACTION_SHOW_TIMERS = "android.intent.action.SHOW_TIMERS"; field public static final java.lang.String ACTION_SNOOZE_ALARM = "android.intent.action.SNOOZE_ALARM"; field public static final java.lang.String ALARM_SEARCH_MODE_ALL = "android.all"; field public static final java.lang.String ALARM_SEARCH_MODE_LABEL = "android.label"; diff --git a/api/system-current.txt b/api/system-current.txt index d06a8acccdaf..63cc09659f3b 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -33656,6 +33656,7 @@ 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 ACTION_SHOW_ALARMS = "android.intent.action.SHOW_ALARMS"; + field public static final java.lang.String ACTION_SHOW_TIMERS = "android.intent.action.SHOW_TIMERS"; field public static final java.lang.String ACTION_SNOOZE_ALARM = "android.intent.action.SNOOZE_ALARM"; field public static final java.lang.String ALARM_SEARCH_MODE_ALL = "android.all"; field public static final java.lang.String ALARM_SEARCH_MODE_LABEL = "android.label"; diff --git a/api/test-current.txt b/api/test-current.txt index ec530bf2e663..353bed3886cc 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -31049,6 +31049,7 @@ 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 ACTION_SHOW_ALARMS = "android.intent.action.SHOW_ALARMS"; + field public static final java.lang.String ACTION_SHOW_TIMERS = "android.intent.action.SHOW_TIMERS"; field public static final java.lang.String ACTION_SNOOZE_ALARM = "android.intent.action.SNOOZE_ALARM"; field public static final java.lang.String ALARM_SEARCH_MODE_ALL = "android.all"; field public static final java.lang.String ALARM_SEARCH_MODE_LABEL = "android.label"; diff --git a/core/java/android/provider/AlarmClock.java b/core/java/android/provider/AlarmClock.java index 63ae9a96c8a6..23134cd0fef7 100644 --- a/core/java/android/provider/AlarmClock.java +++ b/core/java/android/provider/AlarmClock.java @@ -153,6 +153,15 @@ public final class AlarmClock { public static final String ACTION_SET_TIMER = "android.intent.action.SET_TIMER"; /** + * Activity Action: Show the timers. + * <p> + * This action opens the timers page. + * </p> + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_SHOW_TIMERS = "android.intent.action.SHOW_TIMERS"; + + /** * Activity Action: Show the alarms. * <p> * This action opens the alarms page. |