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
This commit is contained in:
Winson Chung
2019-05-09 13:34:48 -07:00
parent cc1159a166
commit 30c626070b
2 changed files with 3 additions and 0 deletions

View File

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

View File

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