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

* commit 'e2f4ab930fa4526cf989624356051b99008c23a6':
  Default "pickup peforms proximity check" to false.
This commit is contained in:
John Spurlock
2015-01-28 17:52:48 +00:00
committed by Android Git Automerger

View File

@@ -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>