From c0cc6218aa5402a9111c8a7808e9caaae1d9d7fe Mon Sep 17 00:00:00 2001 From: Hongwei Wang Date: Mon, 12 Aug 2019 11:26:14 -0700 Subject: [PATCH] Enables back gesture nav in screen pinning Bug: 138969972 Test: Back gesture in screen pinning mode Change-Id: I0ddb7a6e7978e7ec82d7949048e75147c5ece3c8 --- .../android/systemui/shared/system/QuickStepContract.java | 5 ++--- 1 file changed, 2 insertions(+), 3 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 c732584eddfc8..08996c38baf61 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 @@ -188,9 +188,8 @@ public class QuickStepContract { if ((sysuiStateFlags & SYSUI_STATE_BOUNCER_SHOWING) != 0) { return false; } - // Disable when in screen pinning, immersive, or the notifications are interactive - int disableFlags = SYSUI_STATE_SCREEN_PINNING - | SYSUI_STATE_NAV_BAR_HIDDEN + // Disable when in immersive, or the notifications are interactive + int disableFlags = SYSUI_STATE_NAV_BAR_HIDDEN | SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED | SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING; return (sysuiStateFlags & disableFlags) != 0;