| commit | 770e98953e27573d24578008810eeb44c0755995 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu May 21 01:12:58 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu May 21 01:13:00 2015 +0000 |
| tree | 80c9a4a9071362cff5298b8b2af6d47661110543 | |
| parent | 0a17fb4e562d5375f795ee1301c4aba86443e023 [diff] | |
| parent | 5c82e340c38b3fd1fb244f34d72f785efd82480d [diff] |
Merge "Fix ObservableScrollView's cancel dispatch" into mnc-dev
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 @@ } 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;