summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-05-20 18:08:58 -0700
committerAdrian Roos <roosa@google.com>2015-05-20 18:08:58 -0700
commit5c82e340c38b3fd1fb244f34d72f785efd82480d (patch)
treef259b47e949dba770c51e07361115d7f869451c1 /packages
parent970be5313a03de60e1993c3d98027f34c1c9b4f1 (diff)
downloadframeworks_base-5c82e340c38b3fd1fb244f34d72f785efd82480d.zip
frameworks_base-5c82e340c38b3fd1fb244f34d72f785efd82480d.tar.gz
frameworks_base-5c82e340c38b3fd1fb244f34d72f785efd82480d.tar.bz2
Fix ObservableScrollView's cancel dispatch
Bug: 21239185 Change-Id: I8005556a2a6fcd8981e615a6f5537a1d7e9ce6a7
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/ObservableScrollView.java2
1 files changed, 1 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 1186a33..9e5cefd 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ObservableScrollView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ObservableScrollView.java
@@ -99,7 +99,7 @@ public class ObservableScrollView extends ScrollView {
} else if (!mTouchEnabled) {
MotionEvent cancel = MotionEvent.obtain(ev);
cancel.setAction(MotionEvent.ACTION_CANCEL);
- super.dispatchTouchEvent(ev);
+ super.dispatchTouchEvent(cancel);
cancel.recycle();
mTouchCancelled = true;
return false;