Merge "Fix regression in swiping up from lockscreen" into qt-dev am: fafe6dd571 (5c2b8d2f) · Commits · e / os / android_frameworks_base

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

+13 −5

Original line number	Original line	Diff line number	Diff line
	@@ -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;
	}		}

	/**		/**