summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tracy Zhou <tracyzhou@google.com> 2019-07-01 15:27:02 -0700
committer Tracy Zhou <tracyzhou@google.com> 2019-07-01 15:50:15 -0700
commit63b50474abfc7c785618dad02b638acdcb38ab7c (patch)
tree30edb06b52777cd41082690329a41a3c61be931f
parent33cc35006392ab98a5e9678995da2ff4b3f677c0 (diff)
Hide back button in gestural nav mode when the screen is pinned
Fixes: 136063859 Test: Turn on screen pinning in gestural nav mode and observe no visible back key Change-Id: I064ebd3a47bea94ef16c0ce2616b548dd22f718e
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java2
1 files changed, 1 insertions, 1 deletions
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 776cd4d71c94..22e3edb2bbd8 100644
--- 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) {