From 1ba3ac92818701c89e031e40215d89cad38cbc34 Mon Sep 17 00:00:00 2001 From: Sean Stout Date: Mon, 5 Dec 2016 14:05:03 -0800 Subject: [PATCH] Add AlarmClock#SHOW_TIMERS Test: run cts -m CtsContentTestCases Bug: 31228110 Change-Id: Ia291a890b83996d6edf7b75afa52e44557a9117b --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + core/java/android/provider/AlarmClock.java | 9 +++++++++ 4 files changed, 12 insertions(+) diff --git a/api/current.txt b/api/current.txt index 52135edb4320b..2518627721926 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 d06a8acccdaf7..63cc09659f3b8 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 ec530bf2e6632..353bed3886cc5 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 63ae9a96c8a6b..23134cd0fef74 100644 --- a/core/java/android/provider/AlarmClock.java +++ b/core/java/android/provider/AlarmClock.java @@ -152,6 +152,15 @@ public final class AlarmClock { @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_SET_TIMER = "android.intent.action.SET_TIMER"; + /** + * Activity Action: Show the timers. + *

+ * This action opens the timers page. + *

+ */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_SHOW_TIMERS = "android.intent.action.SHOW_TIMERS"; + /** * Activity Action: Show the alarms. *