Merge "Fix regression in screen pinning action" into qt-dev

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) {

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;
             }