am c51688f7: Merge "Don\'t drop up or cancel touch events" into lmp-dev

* commit 'c51688f7c59890f31ffd8a6b79c083e4659dd087':
  Don't drop up or cancel touch events
This commit is contained in:
Adrian Roos
2014-09-02 21:44:34 +00:00
committed by Android Git Automerger

View File

@@ -87,7 +87,9 @@ public class ObservableScrollView extends ScrollView {
@Override
public boolean dispatchTouchEvent(MotionEvent ev) {
if (!mTouchEnabled) {
boolean isEndGuesture = (ev.getAction() == MotionEvent.ACTION_UP
|| ev.getAction() == MotionEvent.ACTION_CANCEL);
if (!mTouchEnabled && !isEndGuesture) {
return false;
}
return super.dispatchTouchEvent(ev);