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

am: 2f9b6f8cd4 Change-Id: Ic94848d060ea76ae069bd4f520480884a46eafb4
2019-07-02 14:40:43 -07:00
parent c3593d7850 2f9b6f8cd4
commit 016ee4fe4a
1 changed files with 1 additions and 1 deletions
--- 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) {