summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Winson Chung <winsonc@google.com> 2018-03-20 17:51:39 -0700
committer Winson Chung <winsonc@google.com> 2018-03-20 17:51:39 -0700
commit770d7e9ca4a8205ee22dbbae9d43909fa263bf24 (patch)
tree8ad0d9aeafa4e5a1a2656b3a9d7e1c5ea0468852
parent8cf1ae492877182fe37aca4237f67fb0634047fb (diff)
Fix issue with slippery state for quickstep button case.
Bug: 76033653 Test: Swipe up with quickstep fallback activity Change-Id: I417b9f2fadeb87cbf2daac57a53e7ff9990335a0
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java5
1 files changed, 2 insertions, 3 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 fcbd37c50f73..8fb0620d8064 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
@@ -679,11 +679,12 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
public void updateStates() {
updateSlippery();
+ reloadNavIcons();
updateNavButtonIcons();
}
private void updateSlippery() {
- setSlippery(mOverviewProxyService.getProxy() != null && mPanelView.isFullyExpanded());
+ setSlippery(!isQuickStepSwipeUpEnabled() || mPanelView.isFullyExpanded());
}
private void setSlippery(boolean slippery) {
@@ -818,8 +819,6 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav
public void onOverviewProxyConnectionChanged(boolean isConnected) {
updateStates();
setUpSwipeUpOnboarding(isQuickStepSwipeUpEnabled());
- reloadNavIcons();
- updateNavButtonIcons();
}
@Override