Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d07305a2 authored by Justin Klaassen's avatar Justin Klaassen Committed by Android (Google) Code Review
Browse files

Merge "Add AlarmClock#SHOW_TIMERS"

parents 7d63b2a9 1ba3ac92

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -30933,6 +30933,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";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -33653,6 +33653,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";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -31046,6 +31046,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";

core/java/android/provider/AlarmClock.java

+9 −0
Original line number Diff line number Diff line
@@ -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.

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