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

This commit is contained in:
Tracy Zhou
2019-07-02 20:56:07 +00:00
committed by Android (Google) Code Review

View File

@@ -627,7 +627,7 @@ public class NavigationBarView extends FrameLayout implements
if (mOverviewProxyService.isEnabled()) { if (mOverviewProxyService.isEnabled()) {
// Force disable recents when not in legacy mode // Force disable recents when not in legacy mode
disableRecent |= !QuickStepContract.isLegacyMode(mNavBarMode); disableRecent |= !QuickStepContract.isLegacyMode(mNavBarMode);
if (pinningActive) { if (pinningActive && !QuickStepContract.isGesturalMode(mNavBarMode)) {
disableBack = disableHome = false; disableBack = disableHome = false;
} }
} else if (pinningActive) { } else if (pinningActive) {