Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix regression in swiping up from lockscreen" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-04 01:20:51 +00:00
committed by Android (Google) Code Review
parent ed97f7b762 241e63d2ff
commit fafe6dd571
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java
View File

@@ -122,13 +122,21 @@ public class QuickStepContract {
* disabled. * disabled.
*/ */
public static boolean isAssistantGestureDisabled(int sysuiStateFlags) { public static boolean isAssistantGestureDisabled(int sysuiStateFlags) {
// Disable when in screen pinning, immersive, the bouncer is showing, or the notifications // Disable when in screen pinning, immersive, the bouncer is showing
// are interactive
int disableFlags = SYSUI_STATE_SCREEN_PINNING int disableFlags = SYSUI_STATE_SCREEN_PINNING
| SYSUI_STATE_NAV_BAR_HIDDEN | SYSUI_STATE_NAV_BAR_HIDDEN
| SYSUI_STATE_BOUNCER_SHOWING | SYSUI_STATE_BOUNCER_SHOWING;
| SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED; if ((sysuiStateFlags & disableFlags) != 0) {
return (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;
} }
/** /**