Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ab8fbbf authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Don't let ScrollView intercept touch events if it can't scroll." into jb-mr1-dev

parents a9fa7b25 0278c2fc

core/java/android/widget/ScrollView.java

+7 −0
Original line number Diff line number Diff line
@@ -460,6 +460,13 @@ public class ScrollView extends FrameLayout { 
            return true;

        }



        /*

         * Don't try to intercept touch if we can't scroll anyway.

         */

        if (getScrollY() == 0 && !canScrollVertically(1)) {

            return false;

        }



        switch (action & MotionEvent.ACTION_MASK) {

            case MotionEvent.ACTION_MOVE: {

                /*