diff options
| author | 2012-11-30 13:03:07 -0800 | |
|---|---|---|
| committer | 2012-11-30 13:03:08 -0800 | |
| commit | 924fc3e6ce68f7943f3fd2ced3281c3fd05f2e7f (patch) | |
| tree | 3c419e969173df7ac7cc534b80a2be59d244c783 | |
| parent | 861c55ffcc854563f4adec0b094c1b6948c72036 (diff) | |
| parent | c08cd02649c04cdc071d63841dfbc3c7c8ff85bb (diff) | |
Merge "Add constant for Daydream settings." into jb-mr1.1-dev
| -rw-r--r-- | core/java/android/provider/Settings.java | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index ad6842816ed4..dc089bdcdf58 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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 /** |