Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 33f2b3b3b1

Change-Id: I212a872da24ea6e64a90e3339cfc9e68f2eaa933
This commit is contained in:
Vladislav Kaznacheev
2017-05-03 07:38:47 +00:00
committed by android-build-merger
parent 3b2ac89b9a 33f2b3b3b1
commit f2b4b8306e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/widget/VideoView.java
View File

@@ -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