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

Commit 924fc3e6 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Add constant for Daydream settings." into jb-mr1.1-dev

parents 861c55ff c08cd026

core/java/android/provider/Settings.java

+15 −0
Original line number Diff line number Diff line
@@ -626,6 +626,21 @@ public final class Settings { 
    public static final String ACTION_NFCSHARING_SETTINGS =

        "android.settings.NFCSHARING_SETTINGS";



    /**

     * Activity Action: Show Daydream settings.

     * <p>

     * In some cases, a matching Activity may not exist, so ensure you

     * safeguard against this.

     * <p>

     * Input: Nothing.

     * <p>

     * Output: Nothing.

     * @see android.service.dreams.DreamService

     * @hide

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_DREAM_SETTINGS = "android.settings.DREAM_SETTINGS";



    // End of Intent actions for Settings



    /**