From ce5474b837a96d422cda291ed23e5f062d38faa1 Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Tue, 2 Sep 2014 23:19:56 +0200 Subject: [PATCH] Don't drop up or cancel touch events Otherwise you're gonna have a bad time. Bug: 17113634 Change-Id: I24fa13a4379bab0cef014010058d08096abda094 --- .../systemui/statusbar/phone/ObservableScrollView.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 53361dcef5913..b842a6ba348d7 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);