| commit | 360d34a8360667b99358b8ac2b1ab7b3d9b7eb28 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Thu May 09 23:42:43 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 09 23:42:43 2019 -0700 |
| tree | 7ca03bb5766645732d6f8a08c48e695b17fa7656 | |
| parent | a33165110a4479548825b1e16324afefd2df0b03 [diff] | |
| parent | 33d0a2e9711d87ab9d1d3081e3cdf487d16ff780 [diff] |
Merge "Fix regression in screen pinning action" into qt-dev am: 33d0a2e971 Change-Id: I2e18e0b810d37dab3065d2e82fb8b1f00920b34d
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 8aa4f03..028dbd7 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 @@ @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 831d882..a6db05e 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 @@ // 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; }