diff options
| author | Adrian Roos <roosa@google.com> | 2016-10-18 22:00:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-10-18 22:00:07 +0000 |
| commit | 392ce6e69855a6abd1ea18da81f2fdecdd3dfc31 (patch) | |
| tree | 5f3ae1553490cfdd0bb0e52e2a60cef87b7f9d5b | |
| parent | fd6e3623da2ccf1668106df966157a3052ca6b15 (diff) | |
| parent | f9a9093e30d27ca1d9e787219d58e47718cf3c55 (diff) | |
| download | angler-392ce6e69855a6abd1ea18da81f2fdecdd3dfc31.tar.gz | |
Merge "Separate ambient display triggers" into nyc-mr1-devnougat-mr1-dev
| -rwxr-xr-x | overlay/frameworks/base/core/res/res/values/config.xml | 3 | ||||
| -rw-r--r-- | overlay/frameworks/base/packages/SystemUI/res/values/config.xml | 3 |
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 1a3c4cb..2b0d0ee 100755 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -277,6 +277,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 9c8433a..cf300bd 100644 --- a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml +++ b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml @@ -34,9 +34,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> - <!-- Doze: can we assume the pickup sensor includes a proximity check? --> <bool name="doze_pickup_performs_proximity_check">true</bool> </resources> |