summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2015-01-28 17:48:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-01-28 17:48:13 +0000
commite2f4ab930fa4526cf989624356051b99008c23a6 (patch)
treeff431a834de937e9a2fbe235f73315fc057c40b1 /packages/SystemUI
parentd8cb404035e8e133e310f5d811d44e3b0ecb8dcf (diff)
parentb9fe4e17135e8d1ea72c9e9e5aa9214fca28b700 (diff)
downloadframeworks_base-e2f4ab930fa4526cf989624356051b99008c23a6.zip
frameworks_base-e2f4ab930fa4526cf989624356051b99008c23a6.tar.gz
frameworks_base-e2f4ab930fa4526cf989624356051b99008c23a6.tar.bz2
Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev
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>