diff options
author | 2014-02-24 22:18:32 +0000 | |
---|---|---|
committer | 2014-02-24 22:18:32 +0000 | |
commit | c213b3a34ccee7cfa72dab281cfa950e5f7df6fc (patch) | |
tree | fe2743140530e213de7ec95ea138c79aa40411ea | |
parent | c004c9a87f0d4afa3a01f39922ad934def93c776 (diff) | |
parent | f7f80d7b54b11d432bb6e72da526edf369128ea7 (diff) |
am f7f80d7b: Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev
* commit 'f7f80d7b54b11d432bb6e72da526edf369128ea7':
Start the dream manager even if dreams are not supported.
-rw-r--r-- | core/res/res/values/config.xml | 10 | ||||
-rw-r--r-- | services/java/com/android/server/SystemServer.java | 5 |
2 files changed, 11 insertions, 4 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 559b11b855ec..96a920df65a5 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1077,8 +1077,16 @@ <!-- Name of the wimax state tracker clas --> <string name="config_wimaxStateTrackerClassname" translatable="false"></string> - <!-- Is the dreams feature supported? --> + <!-- Specifies whether the dreams feature should be supported. + When true, the system will allow the user to configure dreams (screensavers) + to launch when a user activity timeout occurs or the system is told to nap. + When false, the dreams feature will be disabled (this does not affect dozing). + + Consider setting this resource to false or disabling dreams by default when a + doze component is specified below since dreaming will supercede dozing and + will prevent the system from entering a low power state until the dream ends. --> <bool name="config_dreamsSupported">true</bool> + <!-- If supported, are dreams enabled? (by default) --> <bool name="config_dreamsEnabledByDefault">true</bool> <!-- If supported and enabled, are dreams activated when docked? (by default) --> diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index eb446ad68b6f..b498c0ccaae6 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -857,9 +857,8 @@ public final class SystemServer { } } - if (!disableNonCoreServices - && context.getResources().getBoolean(R.bool.config_dreamsSupported)) { - // Dreams (interactive idle-time views, a/k/a screen savers) + if (!disableNonCoreServices) { + // Dreams (interactive idle-time views, a/k/a screen savers, and doze mode) mSystemServiceManager.startService(DreamManagerService.class); } |