summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2016-10-14 15:33:26 -0700
committerAdrian Roos <roosa@google.com>2016-10-17 19:55:01 +0000
commit703d858c1544d00b720feff695417c83b864d51c (patch)
treec43ab5efc469659cf61c5dbea239688f13d3baff
parentf00b8319246a62aa2a53348ceb71e8daf2161732 (diff)
downloadbullhead-703d858c1544d00b720feff695417c83b864d51c.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.xml3
-rw-r--r--overlay/frameworks/base/packages/SystemUI/res/values/config.xml3
2 files changed, 3 insertions, 3 deletions
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index ecece92..6270903 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -183,6 +183,9 @@
and the screen off animation has been performed. -->
<bool name="config_dozeAfterScreenOff">true</bool>
+ <!-- Doze: should the TYPE_PICK_UP_GESTURE sensor be used as a pulse signal. -->
+ <bool name="config_dozePulsePickup">true</bool>
+
<!-- Specifies whether to decouple the interactive state of the device from the display on/off state. -->
<bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index 03e35e1..d2dbefb 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -27,9 +27,6 @@
<!-- 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>
-
<!-- Control whether status bar should distinguish HSPA data icon form UMTS
data icon on devices -->
<bool name="config_hspa_data_distinguishable">true</bool>