From 30c626070bb10b29244ef21b8cce56fb95d22490 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 9 May 2019 13:34:48 -0700
Subject: [PATCH] Fix regression in screen pinning action

- From ag/7178000 we should still check the nav mode to disable the
  recents button

Bug: 130828539
Test: Enable 2 button mode, enter screen pinning

Change-Id: Idf6444be0264f4a62d1b20addc7f1ccd34051a1b
---
 .../android/systemui/statusbar/phone/NavigationBarFragment.java | 1 +
 .../com/android/systemui/statusbar/phone/NavigationBarView.java | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java
index 8aa4f03826491..028dbd717f6fe 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java
@@ -981,6 +981,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
     @Override
     public void onNavigationModeChanged(int mode) {
         mNavBarMode = mode;
+        updateScreenPinningGestures();
     }
 
     public void disableAnimationsDuringHide(long delay) {
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 831d882d68a71..a6db05e7a5952 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
@@ -628,6 +628,8 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
         // as they are used for exiting.
         final boolean pinningActive = ActivityManagerWrapper.getInstance().isScreenPinningActive();
         if (mOverviewProxyService.isEnabled()) {
+            // Force disable recents when not in legacy mode
+            disableRecent |= !QuickStepContract.isLegacyMode(mNavBarMode);
             if (pinningActive) {
                 disableBack = disableHome = false;
             }