summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2016-10-14 15:29:13 -0700
committerAdrian Roos <roosa@google.com>2016-10-17 19:53:31 +0000
commit2538a1c11c5d59c486ca137778ec988e4c3c1aaa (patch)
treeef9b08699180f14f12208b14b439aaf50c9202f4
parenta5eb0b13e1431f547f032f84ebcad346fbfd7dca (diff)
downloadshamu-2538a1c11c5d59c486ca137778ec988e4c3c1aaa.tar.gz
Separate ambient display triggers
Allows configuring notification and sensor triggers separately. Introduces a helper class that hosts the logic for determining what kinds of triggers a device supports. Bug: 32073185 Change-Id: Ie7e8eb6b895dcc54e6f972e70642c7248b9e223a Test: disable "ambient display", sensor triggers should still work
-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>