commit 8cbfad3934d36be7165e6d9c0f96a9ce9a2be114
author John Spurlock <jspurlock@google.com> Wed Jan 28 18:04:56 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 28 18:04:56 2015 +0000
tree 7ceed3dc59e33e8291cc28c02b5681d46f88b41d
parent 293465a75c1346ae1c0e32570344fb9423177eea
parent 7fb346ec209eac91b9673840e10b3c9040dbef3f

am 7fb346ec: am 4b41400b: am e2f4ab93: Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev

* commit '7fb346ec209eac91b9673840e10b3c9040dbef3f':
  Default "pickup peforms proximity check" to false.

packages/SystemUI/res/values/config.xml

diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index 071b9a3..2659009 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -250,7 +250,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>