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:08 +0000 |
commit | f7cbd2380b0b4bcb2f874a8fb156f0892fccd851 (patch) | |
tree | ef1e55430469f1581f6108590fa39f118125f1c9 | |
parent | 64e39261f38960a129144b39b448f0c70d20281d (diff) | |
parent | 2538a1c11c5d59c486ca137778ec988e4c3c1aaa (diff) | |
download | shamu-f7cbd2380b0b4bcb2f874a8fb156f0892fccd851.tar.gz |
Merge "Separate ambient display triggers" into nyc-mr1-devnougat-mr1-dev
-rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 1 | ||||
-rw-r--r-- | overlay/frameworks/base/packages/SystemUI/res/values/config.xml | 2 |
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> |