| commit | f6275e27206aa6ee4383908627bb3db855c7fec9 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Feb 01 20:55:39 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Feb 01 20:55:39 2018 +0000 |
| tree | dd596d6c411bae1ff96d2e34733cc5afbc06ee87 | |
| parent | e6e19a518cdccc3c0b8486e3c251f57c02ed4bc0 [diff] | |
| parent | db8506a335e5b0b6a14acf2e07837279db01cbf4 [diff] |
Merge "Fixes quickstep swipe up animation being stuck"
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 cd220a7..c37dd55 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
@@ -300,7 +300,7 @@ } } } - return mRecentsAnimationStarted || mGestureHelper.onInterceptTouchEvent(event); + return mGestureHelper.onInterceptTouchEvent(event) || mRecentsAnimationStarted; } public void abortCurrentGesture() {