summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2014-09-02 23:19:56 +0200
committerAdrian Roos <roosa@google.com>2014-09-02 23:19:56 +0200
commitce5474b837a96d422cda291ed23e5f062d38faa1 (patch)
tree07577063206e0e34356837a872f543a54ae94dfa /packages/SystemUI
parent192ba20d2a120356d8c046e92c80065f89e2eac2 (diff)
downloadframeworks_base-ce5474b837a96d422cda291ed23e5f062d38faa1.zip
frameworks_base-ce5474b837a96d422cda291ed23e5f062d38faa1.tar.gz
frameworks_base-ce5474b837a96d422cda291ed23e5f062d38faa1.tar.bz2
Don't drop up or cancel touch events
Otherwise you're gonna have a bad time. Bug: 17113634 Change-Id: I24fa13a4379bab0cef014010058d08096abda094
Diffstat (limited to 'packages/SystemUI')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/ObservableScrollView.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ObservableScrollView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ObservableScrollView.java
index 53361dc..b842a6b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ObservableScrollView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ObservableScrollView.java
@@ -87,7 +87,9 @@ public class ObservableScrollView extends ScrollView {
@Override
public boolean dispatchTouchEvent(MotionEvent ev) {
- if (!mTouchEnabled) {
+ boolean isEndGuesture = (ev.getAction() == MotionEvent.ACTION_UP
+ || ev.getAction() == MotionEvent.ACTION_CANCEL);
+ if (!mTouchEnabled && !isEndGuesture) {
return false;
}
return super.dispatchTouchEvent(ev);