Merge "HorizontalScrollView should delay child presses" into ics-mr1

core/java/android/widget/HorizontalScrollView.java

@@ -696,6 +696,11 @@ public class HorizontalScrollView extends FrameLayout {
         return super.onGenericMotionEvent(event);
     }
 
+    @Override
+    public boolean shouldDelayChildPressedState() {
+        return true;
+    }
+
     @Override
     protected void onOverScrolled(int scrollX, int scrollY,
             boolean clampedX, boolean clampedY) {