summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2015-01-28 17:52:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-28 17:52:48 +0000
commit4b41400b60d57f23b16702540b9d50f98aeeffb7 (patch)
tree6eb1da1e274124e43839486398900c9101fddcc8 /packages/SystemUI
parentfdb8dff54cf9327089e5ee4d5bf461ef42020fcd (diff)
parente2f4ab930fa4526cf989624356051b99008c23a6 (diff)
downloadframeworks_base-4b41400b60d57f23b16702540b9d50f98aeeffb7.zip
frameworks_base-4b41400b60d57f23b16702540b9d50f98aeeffb7.tar.gz
frameworks_base-4b41400b60d57f23b16702540b9d50f98aeeffb7.tar.bz2
am e2f4ab93: Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev
* commit 'e2f4ab930fa4526cf989624356051b99008c23a6': Default "pickup peforms proximity check" to false.
Diffstat (limited to 'packages/SystemUI')
-rw-r--r--packages/SystemUI/res/values/config.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index 5b18b24..2b665c3 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -255,7 +255,7 @@
<integer name="doze_pickup_vibration_threshold">2000</integer>
<!-- Doze: can we assume the pickup sensor includes a proximity check? -->
- <bool name="doze_pickup_performs_proximity_check">true</bool>
+ <bool name="doze_pickup_performs_proximity_check">false</bool>
<!-- Doze: pulse parameter - how long does it take to fade in? -->
<integer name="doze_pulse_duration_in">900</integer>