commit 2f9b6f8cd4755dcfc528bae599bc17f3d0909a87
author Tracy Zhou <tracyzhou@google.com> Tue Jul 02 20:56:07 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 02 20:56:07 2019 +0000
tree f9d5aa7dee47c268090eb414ae708042e1b4a6de
parent 6836e6d02ef9902816217bb235eb76f9ddd2c39b
parent 63b50474abfc7c785618dad02b638acdcb38ab7c

Merge "Hide back button in gestural nav mode when the screen is pinned" into qt-r1-dev

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java

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 776cd4d..22e3edb 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 @@
         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) {