Merge "Fix ObservableScrollView's cancel dispatch" into mnc-dev

2015-05-21 01:12:58 +00:00
parent 0a17fb4e56 5c82e340c3
commit 770e98953e
1 changed files with 1 additions and 1 deletions
--- 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;