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 | 24ddbc8038b1ca9a10d8c13c64f692527ba7bf11 (patch) | |
| tree | 0505e0ca17cc363a1c9b46f8ca07954a27967c87 | |
| parent | 4c3ba4dafe9e311dab87edb8fc7016006a1fa29b (diff) | |
| parent | 703d858c1544d00b720feff695417c83b864d51c (diff) | |
| download | bullhead-24ddbc8038b1ca9a10d8c13c64f692527ba7bf11.tar.gz | |
Merge "Separate ambient display triggers" into nyc-mr1-dev
| -rw-r--r-- | 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 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> |