summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2015-01-28 17:58:35 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-28 17:58:35 +0000
commit7fb346ec209eac91b9673840e10b3c9040dbef3f (patch)
treefbd67eb5d1dbf6fbec89180d4759b09dbbe3ca86 /packages/SystemUI
parentf2d5253bce5ef69cb6cb4da7697a228a47b55904 (diff)
parent4b41400b60d57f23b16702540b9d50f98aeeffb7 (diff)
downloadframeworks_base-7fb346ec209eac91b9673840e10b3c9040dbef3f.zip
frameworks_base-7fb346ec209eac91b9673840e10b3c9040dbef3f.tar.gz
frameworks_base-7fb346ec209eac91b9673840e10b3c9040dbef3f.tar.bz2
am 4b41400b: am e2f4ab93: Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev
* commit '4b41400b60d57f23b16702540b9d50f98aeeffb7': 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>