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

Commit 015b2c1e authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 8ab8fbbf: Merge "Don\'t let ScrollView intercept touch events if it can\'t... 

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

* commit '8ab8fbbf':
  Don't let ScrollView intercept touch events if it can't scroll.
parents 1e6b7a64 8ab8fbbf

core/java/android/widget/ScrollView.java

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

            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) {

        switch (action & MotionEvent.ACTION_MASK) {

            case MotionEvent.ACTION_MOVE: {

            case MotionEvent.ACTION_MOVE: {

                /*

                /*