diff options
| author | Lucas Dupin <dupin@google.com> | 2018-03-21 18:04:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-21 18:04:50 +0000 |
| commit | 8338adf61f8ab8378a4eb195c5c9da608b66a887 (patch) | |
| tree | baa866f438dc240d8a7292b90d23b0d6414c8078 | |
| parent | 2d1128fe54974a146f186b36b88092fb385e8659 (diff) | |
| parent | 1d9d5777af2e530661cf3679a4730f5675fb4096 (diff) | |
| download | bonito-8338adf61f8ab8378a4eb195c5c9da608b66a887.tar.gz | |
Merge "Renamed config_dozeAfterScreenOff" into pi-dev
3 files changed, 1 insertions, 9 deletions
diff --git a/blueline/overlay/frameworks/base/core/res/res/values/config.xml b/blueline/overlay/frameworks/base/core/res/res/values/config.xml index a8849cc4..b29387a6 100755 --- a/blueline/overlay/frameworks/base/core/res/res/values/config.xml +++ b/blueline/overlay/frameworks/base/core/res/res/values/config.xml @@ -44,10 +44,6 @@ ComponentName of a dream to show whenever the system would otherwise have gone to sleep. --> <string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string> - <!-- If true, the doze component is not started until after the screen has been turned off - and the screen off animation has been performed. --> - <bool name="config_dozeAfterScreenOff">true</bool> - <!-- Type of the double tap sensor. Empty if double tap is not supported. --> <string name="config_dozeDoubleTapSensorType" translatable="false">com.google.sensor.double_touch</string> diff --git a/crosshatch/overlay/frameworks/base/core/res/res/values/config.xml b/crosshatch/overlay/frameworks/base/core/res/res/values/config.xml index 398f01bb..c23a39df 100755 --- a/crosshatch/overlay/frameworks/base/core/res/res/values/config.xml +++ b/crosshatch/overlay/frameworks/base/core/res/res/values/config.xml @@ -44,10 +44,6 @@ ComponentName of a dream to show whenever the system would otherwise have gone to sleep. --> <string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string> - <!-- If true, the doze component is not started until after the screen has been turned off - and the screen off animation has been performed. --> - <bool name="config_dozeAfterScreenOff">true</bool> - <!-- Type of the double tap sensor. Empty if double tap is not supported. --> <string name="config_dozeDoubleTapSensorType" translatable="false">com.google.sensor.double_touch</string> diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index c8bcf904..63201da0 100755 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -214,7 +214,7 @@ <!-- If true, the doze component is not started until after the screen has been turned off and the screen off animation has been performed. --> - <bool name="config_dozeAfterScreenOff">true</bool> + <bool name="config_dozeAfterScreenOffByDefault">true</bool> <!-- Doze: should the TYPE_PICK_UP_GESTURE sensor be used as a pulse signal. --> <bool name="config_dozePulsePickup">true</bool> |