From 5c82e340c38b3fd1fb244f34d72f785efd82480d Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Wed, 20 May 2015 18:08:58 -0700
Subject: [PATCH] Fix ObservableScrollView's cancel dispatch

Bug: 21239185
Change-Id: I8005556a2a6fcd8981e615a6f5537a1d7e9ce6a7
---
 .../android/systemui/statusbar/phone/ObservableScrollView.java  | 2 +-
 1 file changed, 1 insertion(+), 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 1186a330064d0..9e5cefd7b13c6 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;