summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Selim Cinek <cinek@google.com> 2016-09-29 21:17:12 +0000
committer android-build-merger <android-build-merger@google.com> 2016-09-29 21:17:12 +0000
commit61e4934b8fbfdb42f39334a32332d51b5115ec0e (patch)
tree0d92e360f1dfe630ff2e87185b5b27eba1ede233
parent2ab563ec6a572383b99cd90edbcaa310775e3be7 (diff)
parentecfc6b52ecbcb822978a6a7b646f0880042f1a77 (diff)
Fixed a bug where the scroller would stop tracking
am: ecfc6b52ec Change-Id: I3f8cfbaa26a90f62246fb5161e4b4cc853a9832c
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
index 3e339d8b2940..84a2770841b0 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
@@ -1228,7 +1228,7 @@ public class NotificationStackScrollLayout extends ViewGroup
if (!isScrollingEnabled()) {
return false;
}
- if (ev.getY() < mQsContainer.getBottom()) {
+ if (ev.getY() < mQsContainer.getBottom() && !mIsBeingDragged) {
return false;
}
mForcedScroll = null;