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 
am: fafe6dd571

Change-Id: Ie6a8a8983c4fa9340309353670f7940b12f2c18b
This commit is contained in:
Winson Chung
2019-06-03 18:38:38 -07:00
committed by android-build-merger
parent 1b432c135f fafe6dd571
commit 466b5dfd34
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.
*/
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;
}
/**