diff options
| author | Daniel Sandler <dsandler@android.com> | 2011-12-01 06:29:53 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-01 06:29:53 -0800 |
| commit | 2a40d0d92b208021b492e9af3d944720cbf269fc (patch) | |
| tree | 0fed812542ce9f29c2c329bfb8d360f7984e0b53 /core | |
| parent | 41a5774a99215025628b83db54c45f84b876678e (diff) | |
| parent | d2b22a885a79d537c79e98257647cc120bde2998 (diff) | |
| download | frameworks_base-2a40d0d92b208021b492e9af3d944720cbf269fc.zip frameworks_base-2a40d0d92b208021b492e9af3d944720cbf269fc.tar.gz frameworks_base-2a40d0d92b208021b492e9af3d944720cbf269fc.tar.bz2 | |
Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/provider/Settings.java | 22 | ||||
| -rwxr-xr-x | core/res/res/values/config.xml | 3 |
2 files changed, 0 insertions, 25 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index ee3215c..15e4438 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -4019,28 +4019,6 @@ public final class Settings { public static final String SETUP_PREPAID_DETECTION_REDIR_HOST = "setup_prepaid_detection_redir_host"; - /** - * 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 a timeout when not on - * battery, or upon dock insertion (if SCREENSAVER_ACTIVATE_ON_DOCK is set to 1). - * @hide - */ - public static final String SCREENSAVER_COMPONENT = "screensaver_component"; - - /** - * Whether the screensaver should be automatically launched when the device is inserted - * into a (desk) dock. - * @hide - */ - public static final String SCREENSAVER_ACTIVATE_ON_DOCK = "screensaver_activate_on_dock"; - /** {@hide} */ public static final String NETSTATS_ENABLED = "netstats_enabled"; /** {@hide} */ diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 25f7d25..767cafe 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -741,7 +741,4 @@ <string name="config_wimaxServiceClassname"></string> <!-- Name of the wimax state tracker clas --> <string name="config_wimaxStateTrackerClassname"></string> - - <!-- Name of screensaver components to look for if none has been chosen by the user --> - <string name="config_defaultDreamComponent">com.google.android.deskclock/com.android.deskclock.Screensaver</string> </resources> |