summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2016-10-18 22:06:27 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-10-18 22:06:27 +0000
commit3e66099f888e252ae97a34dee5f0c2b47d434e76 (patch)
treeef1e55430469f1581f6108590fa39f118125f1c9
parent383a93b9fc2e1619df44cd7865923b1103e85823 (diff)
parent2538a1c11c5d59c486ca137778ec988e4c3c1aaa (diff)
downloadshamu-3e66099f888e252ae97a34dee5f0c2b47d434e76.tar.gz
Separate ambient display triggers
am: 2538a1c11c Change-Id: Ifcde1ba49a54ac5cba7037a23727569238f811bd
-rw-r--r--overlay/frameworks/base/core/res/res/values/config.xml1
-rw-r--r--overlay/frameworks/base/packages/SystemUI/res/values/config.xml2
2 files changed, 1 insertions, 2 deletions
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 69822af5..e4d46d07 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -272,6 +272,7 @@
<!-- Dream of notifications -->
<string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
<bool name="config_dozeAfterScreenOff">true</bool>
+ <bool name="config_dozePulsePickup">true</bool>
<bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
<!-- Is the device capable of hot swapping an UICC Card -->
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index d9918c7f..c3fa2c10 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -34,7 +34,5 @@
<!-- Doze: does this device support STATE_DOZE and STATE_DOZE_SUSPEND? -->
<bool name="doze_display_state_supported">true</bool>
- <!-- Doze: should the pickup sensor be used as a pulse signal? -->
- <bool name="doze_pulse_on_pick_up">true</bool>
</resources>