diff options
| author | Daniel Sandler <dsandler@android.com> | 2011-11-19 20:44:36 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-19 20:44:36 -0800 |
| commit | 75d8eb2a818508d135ea0aac46db8afc54445489 (patch) | |
| tree | 1248fe1401c1086154d43513532ad12b02133e04 /core/java/android/provider | |
| parent | 4a8a67950eb15429ce3c5b657443be2261259d95 (diff) | |
| parent | 9b5d7a59f336a96e73f5f485f6e366e078a70497 (diff) | |
| download | frameworks_base-75d8eb2a818508d135ea0aac46db8afc54445489.zip frameworks_base-75d8eb2a818508d135ea0aac46db8afc54445489.tar.gz frameworks_base-75d8eb2a818508d135ea0aac46db8afc54445489.tar.bz2 | |
am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1
* commit '9b5d7a59f336a96e73f5f485f6e366e078a70497':
Dreams (now Screen Candy) development.
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 13a95e3..3876655 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -4032,21 +4032,26 @@ public final class Settings { "setup_prepaid_detection_redir_host"; /** - * The user's preferred "dream" (interactive screensaver) component. + * Whether the screensaver is enabled. + * @hide + */ + public static final String SCREENSAVER_ENABLED = "screensaver_enabled"; + + /** + * The user's chosen screensaver component. * - * This component will be launched by the PhoneWindowManager after the user's chosen idle - * timeout (specified by {@link #DREAM_TIMEOUT}). + * This component will be launched by the PhoneWindowManager after a timeout when not on + * battery, or upon dock insertion (if SCREENSAVER_ACTIVATE_ON_DOCK is set to 1). * @hide */ - public static final String DREAM_COMPONENT = - "dream_component"; + public static final String SCREENSAVER_COMPONENT = "screensaver_component"; /** - * The delay before a "dream" is started (set to 0 to disable). + * Whether the screensaver should be automatically launched when the device is inserted + * into a (desk) dock. * @hide */ - public static final String DREAM_TIMEOUT = - "dream_timeout"; + public static final String SCREENSAVER_ACTIVATE_ON_DOCK = "screensaver_activate_on_dock"; /** {@hide} */ public static final String NETSTATS_ENABLED = "netstats_enabled"; |