summaryrefslogtreecommitdiff
path: root/core/java/android/widget/ScrollView.java
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2011-07-14 22:32:09 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-14 22:32:09 -0700
commit997ea74ef78139b29ab2a0250aa243e6d96d8dfd (patch)
tree28e0cd51127aee18525f014baf814343843e345a /core/java/android/widget/ScrollView.java
parent945caeeaa8f5dfacdb878239e0bfa8c9d11d9339 (diff)
parenta6111377e1edbc5d63fc2a7205d58b2d9c21d978 (diff)
Merge "Remove edge slop support."
Diffstat (limited to 'core/java/android/widget/ScrollView.java')
-rw-r--r--core/java/android/widget/ScrollView.java7
1 files changed, 0 insertions, 7 deletions
diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java
index 12775a49ff3a..191410bf3624 100644
--- a/core/java/android/widget/ScrollView.java
+++ b/core/java/android/widget/ScrollView.java
@@ -506,13 +506,6 @@ public class ScrollView extends FrameLayout {
@Override
public boolean onTouchEvent(MotionEvent ev) {
-
- if (ev.getAction() == MotionEvent.ACTION_DOWN && ev.getEdgeFlags() != 0) {
- // Don't handle edge touches immediately -- they may actually belong to one of our
- // descendants.
- return false;
- }
-
if (mVelocityTracker == null) {
mVelocityTracker = VelocityTracker.obtain();
}