From 63b50474abfc7c785618dad02b638acdcb38ab7c Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Mon, 1 Jul 2019 15:27:02 -0700
Subject: [PATCH] Hide back button in gestural nav mode when the screen is
 pinned

Fixes: 136063859
Test: Turn on screen pinning in gestural nav mode and observe no visible
back key

Change-Id: I064ebd3a47bea94ef16c0ce2616b548dd22f718e
---
 .../com/android/systemui/statusbar/phone/NavigationBarView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
index 776cd4d71c945..22e3edb2bbd8e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
@@ -627,7 +627,7 @@ public class NavigationBarView extends FrameLayout implements
         if (mOverviewProxyService.isEnabled()) {
             // Force disable recents when not in legacy mode
             disableRecent |= !QuickStepContract.isLegacyMode(mNavBarMode);
-            if (pinningActive) {
+            if (pinningActive && !QuickStepContract.isGesturalMode(mNavBarMode)) {
                 disableBack = disableHome = false;
             }
         } else if (pinningActive) {