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

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

Merge "Unhide action to launch Daydream settings." into jb-mr2-dev

parents 03a91724 f3c1c7ea

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -19864,6 +19864,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_DATE_SETTINGS = "android.settings.DATE_SETTINGS";

    field public static final java.lang.String ACTION_DEVICE_INFO_SETTINGS = "android.settings.DEVICE_INFO_SETTINGS";

    field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS";

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

    field public static final java.lang.String ACTION_INPUT_METHOD_SETTINGS = "android.settings.INPUT_METHOD_SETTINGS";

    field public static final java.lang.String ACTION_INPUT_METHOD_SUBTYPE_SETTINGS = "android.settings.INPUT_METHOD_SUBTYPE_SETTINGS";

    field public static final java.lang.String ACTION_INTERNAL_STORAGE_SETTINGS = "android.settings.INTERNAL_STORAGE_SETTINGS";

core/java/android/provider/Settings.java

+0 −1
Original line number Diff line number Diff line
@@ -650,7 +650,6 @@ public final class Settings { 
     * <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";