Commit 71de1d37 by tonihei Committed by Oliver Woodman

Don't consume touch events if no controller is attached.

Issue:#6109
PiperOrigin-RevId: 255933121
parent 6fe70ca4
...@@ -1050,6 +1050,9 @@ public class PlayerView extends FrameLayout implements AdsLoader.AdViewProvider ...@@ -1050,6 +1050,9 @@ public class PlayerView extends FrameLayout implements AdsLoader.AdViewProvider
@Override @Override
public boolean onTouchEvent(MotionEvent event) { public boolean onTouchEvent(MotionEvent event) {
if (!useController || player == null) {
return false;
}
switch (event.getAction()) { switch (event.getAction()) {
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN:
isTouching = true; isTouching = true;
...@@ -1150,9 +1153,6 @@ public class PlayerView extends FrameLayout implements AdsLoader.AdViewProvider ...@@ -1150,9 +1153,6 @@ public class PlayerView extends FrameLayout implements AdsLoader.AdViewProvider
// Internal methods. // Internal methods.
private boolean toggleControllerVisibility() { private boolean toggleControllerVisibility() {
if (!useController || player == null) {
return false;
}
if (!controller.isVisible()) { if (!controller.isVisible()) {
maybeShowController(true); maybeShowController(true);
} else if (controllerHideOnTouch) { } else if (controllerHideOnTouch) {
...@@ -1471,6 +1471,9 @@ public class PlayerView extends FrameLayout implements AdsLoader.AdViewProvider ...@@ -1471,6 +1471,9 @@ public class PlayerView extends FrameLayout implements AdsLoader.AdViewProvider
@Override @Override
public boolean onSingleTapUp(MotionEvent e) { public boolean onSingleTapUp(MotionEvent e) {
if (!useController || player == null) {
return false;
}
return toggleControllerVisibility(); return toggleControllerVisibility();
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment