drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9e129f37: am 924fc3e6: Merge "Add constant for Daydream settings." into jb-mr1.1-dev

Browse Source 
* commit '9e129f37b6dd6f8c3d1a3869ae60285a414c8558':
  Add constant for Daydream settings.
This commit is contained in:
Daniel Sandler
2012-11-30 13:22:03 -08:00
committed by Android Git Automerger
parent c9c948ba49 9e129f37b6
commit 57b47ae95d
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/provider/Settings.java
View File

@ -626,6 +626,21 @@ public final class Settings {
public static final String ACTION_NFCSHARING_SETTINGS = public static final String ACTION_NFCSHARING_SETTINGS =
"android.settings.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 // End of Intent actions for Settings
/** /**