| commit | de64ee0126675a1175d14badb258943f491991b8 | [log] [tgz] |
|---|---|---|
| author | Lucas Dupin <dupin@google.com> | Fri Dec 21 14:45:12 2018 -0800 |
| committer | Lucas Dupin <dupin@google.com> | Wed Dec 26 13:28:41 2018 -0800 |
| tree | 3eb2cd9211377a8cd4ccd8a7f5c9b276b8eda806 | |
| parent | ce441748acceca8055945615915a7425bbf93602 [diff] [blame] |
make wake event trigger a pulse Test: manual Test: atest ScrimControllerTest Bug: 111405682 Bug: 111395593 Change-Id: I5a7b9024ecd5aea691ac5e3f23e70818186fc37c
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java index 92a9efe..6f2b63d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
@@ -158,8 +158,11 @@ * @return duration in millis. */ public long getWallpaperAodDuration() { - return shouldControlScreenOff() ? DozeScreenState.ENTER_DOZE_HIDE_WALLPAPER_DELAY - : mAlwaysOnPolicy.wallpaperVisibilityDuration; + if (mAmbientDisplayConfiguration.wakeLockScreenGestureEnabled(UserHandle.USER_CURRENT) + || shouldControlScreenOff()) { + return DozeScreenState.ENTER_DOZE_HIDE_WALLPAPER_DELAY; + } + return mAlwaysOnPolicy.wallpaperVisibilityDuration; } /**