diff options
| author | 2013-05-30 12:36:59 -0700 | |
|---|---|---|
| committer | 2013-05-30 12:36:59 -0700 | |
| commit | 491c607582248590702ce07c0493ff0c39224689 (patch) | |
| tree | 780754eb9949d2176ef9d8b68037d55425307845 | |
| parent | b2903bc64da3c684376c24cf485e90c9cf0736af (diff) | |
| parent | 054255c6d282a4ab2a95e56859242a2512871296 (diff) | |
am 054255c6: Merge "Unhide action to launch Daydream settings." into jb-mr2-dev
* commit '054255c6d282a4ab2a95e56859242a2512871296':
Unhide action to launch Daydream settings.
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 613983374334..9e9e9a99def7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index f74238518e98..3c8187eba96d 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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"; |