summaryrefslogtreecommitdiff
path: root/overlay/frameworks
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2013-09-12 15:18:22 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-12 15:18:22 -0700
commita940dd885664754db9767bda7eeeea1e6cb9a632 (patch)
treea3d9b543b659a124ea6c052996184825dd038365 /overlay/frameworks
parent29405a800b7cc43bd7c3e8bedfbf6081b16f5912 (diff)
parent25ca5777147f6e1b769f69c591c516b7fc9ae8aa (diff)
downloadmako-a940dd885664754db9767bda7eeeea1e6cb9a632.tar.gz
am 25ca5777: Merge "Allow device to enter suspend with positive proximity." into klp-dev
* commit '25ca5777147f6e1b769f69c591c516b7fc9ae8aa': Allow device to enter suspend with positive proximity.
Diffstat (limited to 'overlay/frameworks')
-rw-r--r--overlay/frameworks/base/core/res/res/values/config.xml7
1 files changed, 7 insertions, 0 deletions
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index c073102..7d32ba1 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -252,4 +252,11 @@
<!-- Flag indicating if the speed up audio on mt call code should be executed -->
<bool name="config_speed_up_audio_on_mt_calls">true</bool>
+ <!-- Indicate whether to allow the device to suspend when the screen is off
+ due to the proximity sensor. This resource should only be set to true
+ if the sensor HAL correctly handles the proximity sensor as a wake-up source.
+ Otherwise, the device may fail to wake out of suspend reliably.
+ The default is false. -->
+ <bool name="config_suspendWhenScreenOffDueToProximity">true</bool>
+
</resources>