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

Commit f2b4b830 authored by Vladislav Kaznacheev's avatar Vladislav Kaznacheev Committed by android-build-merger
Browse files

Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev 

am: 33f2b3b3

Change-Id: I212a872da24ea6e64a90e3339cfc9e68f2eaa933
parents 3b2ac89b 33f2b3b3

core/java/android/widget/VideoView.java

+6 −4
Original line number Diff line number Diff line
@@ -708,18 +708,20 @@ public class VideoView extends SurfaceView 


    @Override

    public boolean onTouchEvent(MotionEvent ev) {

        if (isInPlaybackState() && mMediaController != null) {

        if (ev.getAction() == MotionEvent.ACTION_DOWN

                && isInPlaybackState() && mMediaController != null) {

            toggleMediaControlsVisiblity();

        }

        return false;

        return super.onTouchEvent(ev);

    }



    @Override

    public boolean onTrackballEvent(MotionEvent ev) {

        if (isInPlaybackState() && mMediaController != null) {

        if (ev.getAction() == MotionEvent.ACTION_DOWN

                && isInPlaybackState() && mMediaController != null) {

            toggleMediaControlsVisiblity();

        }

        return false;

        return super.onTrackballEvent(ev);

    }



    @Override