sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Keep controller visible on d-pad key events

Browse source 
PiperOrigin-RevId: 250661977
This commit is contained in:
olly 2019-05-30 11:54:15 +01:00 committed by Toni
parent b8ec05aea1
commit 6e7012413b
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASENOTES.md
View file

@ -24,6 +24,8 @@
`PlayerControlView`. `PlayerControlView`.
* Change playback controls toggle from touch down to touch up events * Change playback controls toggle from touch down to touch up events
([#5784](https://github.com/google/ExoPlayer/issues/5784)). ([#5784](https://github.com/google/ExoPlayer/issues/5784)).
* Fix issue where playback controls were not kept visible on key presses
([#5963](https://github.com/google/ExoPlayer/issues/5963)).
* Add a workaround for broken raw audio decoding on Oppo R9 * Add a workaround for broken raw audio decoding on Oppo R9
([#5782](https://github.com/google/ExoPlayer/issues/5782)). ([#5782](https://github.com/google/ExoPlayer/issues/5782)).
* Offline: * Offline:

19
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
View file

@ -772,11 +772,20 @@ public class PlayerView extends FrameLayout implements AdsLoader.AdViewProvider
if (player != null && player.isPlayingAd()) { if (player != null && player.isPlayingAd()) {
return super.dispatchKeyEvent(event); return super.dispatchKeyEvent(event);
} }
boolean isDpadWhenControlHidden =
isDpadKey(event.getKeyCode()) && useController && !controller.isVisible(); boolean isDpadAndUseController = isDpadKey(event.getKeyCode()) && useController;
boolean handled = boolean handled = false;
isDpadWhenControlHidden || dispatchMediaKeyEvent(event) || super.dispatchKeyEvent(event); if (isDpadAndUseController && !controller.isVisible()) {
if (handled) { // Handle the key event by showing the controller.
maybeShowController(true);
handled = true;
} else if (dispatchMediaKeyEvent(event) || super.dispatchKeyEvent(event)) {
// The key event was handled as a media key or by the super class. We should also show the
// controller, or extend its show timeout if already visible.
maybeShowController(true);
handled = true;
} else if (isDpadAndUseController) {
// The key event wasn't handled, but we should extend the controller's show timeout.
maybeShowController(true); maybeShowController(true);
} }
return handled; return handled;