From 241e63d2ffa4d2fa290af5db0eb9c899767948c6 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Mon, 3 Jun 2019 14:29:20 -0700 Subject: [PATCH] Fix regression in swiping up from lockscreen Bug: 134391878 Test: Swipe up to assistant from lockscreen Change-Id: I32fe638de507775c5744344bc5e71509e4a5b0e1 --- .../shared/system/QuickStepContract.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java index cc3a67cd27887..240691b9c65cb 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java @@ -122,13 +122,21 @@ public class QuickStepContract { * disabled. */ public static boolean isAssistantGestureDisabled(int sysuiStateFlags) { - // Disable when in screen pinning, immersive, the bouncer is showing, or the notifications - // are interactive + // Disable when in screen pinning, immersive, the bouncer is showing int disableFlags = SYSUI_STATE_SCREEN_PINNING | SYSUI_STATE_NAV_BAR_HIDDEN - | SYSUI_STATE_BOUNCER_SHOWING - | SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED; - return (sysuiStateFlags & disableFlags) != 0; + | SYSUI_STATE_BOUNCER_SHOWING; + if ((sysuiStateFlags & disableFlags) != 0) { + return true; + } + + // Disable when notifications are showing (only if unlocked) + if ((sysuiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) != 0 + && (sysuiStateFlags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING) == 0) { + return true; + } + + return false; } /**