diff options
| author | Adrian Roos <roosa@google.com> | 2015-05-21 01:12:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-21 01:13:00 +0000 |
| commit | 770e98953e27573d24578008810eeb44c0755995 (patch) | |
| tree | 80c9a4a9071362cff5298b8b2af6d47661110543 /packages/SystemUI/src/com/android/systemui/statusbar | |
| parent | 0a17fb4e562d5375f795ee1301c4aba86443e023 (diff) | |
| parent | 5c82e340c38b3fd1fb244f34d72f785efd82480d (diff) | |
| download | frameworks_base-770e98953e27573d24578008810eeb44c0755995.zip frameworks_base-770e98953e27573d24578008810eeb44c0755995.tar.gz frameworks_base-770e98953e27573d24578008810eeb44c0755995.tar.bz2 | |
Merge "Fix ObservableScrollView's cancel dispatch" into mnc-dev
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/ObservableScrollView.java | 2 |
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; |