loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-15 19:49:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Apply styled widget's bug fixes to legacy widget

Browse Source 
- Prevent buffering when clicking ffwd button at the end of stream
- Set VR button disabled when listener is not registered

PiperOrigin-RevId: 330039336
This commit is contained in:
insun 2020-09-04 03:38:56 +01:00 committed by Oliver Woodman
parent 45dc66ef2f
commit ea158dcdb0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
View File

@ -481,6 +481,7 @@ public class PlayerControlView extends FrameLayout {
} }
vrButton = findViewById(R.id.exo_vr); vrButton = findViewById(R.id.exo_vr);
setShowVrButton(false); setShowVrButton(false);
updateButton(false, false, vrButton);
Resources resources = context.getResources(); Resources resources = context.getResources();
@ -794,6 +795,7 @@ public class PlayerControlView extends FrameLayout {
public void setVrButtonListener(@Nullable OnClickListener onClickListener) { public void setVrButtonListener(@Nullable OnClickListener onClickListener) {
if (vrButton != null) { if (vrButton != null) {
vrButton.setOnClickListener(onClickListener); vrButton.setOnClickListener(onClickListener);
updateButton(getShowVrButton(), onClickListener != null, vrButton);
} }
} }
@ -1205,7 +1207,9 @@ public class PlayerControlView extends FrameLayout {
} }
if (event.getAction() == KeyEvent.ACTION_DOWN) { if (event.getAction() == KeyEvent.ACTION_DOWN) {
if (keyCode == KeyEvent.KEYCODE_MEDIA_FAST_FORWARD) { if (keyCode == KeyEvent.KEYCODE_MEDIA_FAST_FORWARD) {
if (player.getPlaybackState() != Player.STATE_ENDED) {
controlDispatcher.dispatchFastForward(player); controlDispatcher.dispatchFastForward(player);
}
} else if (keyCode == KeyEvent.KEYCODE_MEDIA_REWIND) { } else if (keyCode == KeyEvent.KEYCODE_MEDIA_REWIND) {
controlDispatcher.dispatchRewind(player); controlDispatcher.dispatchRewind(player);
} else if (event.getRepeatCount() == 0) { } else if (event.getRepeatCount() == 0) {
@ -1377,7 +1381,9 @@ public class PlayerControlView extends FrameLayout {
} else if (previousButton == view) { } else if (previousButton == view) {
controlDispatcher.dispatchPrevious(player); controlDispatcher.dispatchPrevious(player);
} else if (fastForwardButton == view) { } else if (fastForwardButton == view) {
if (player.getPlaybackState() != Player.STATE_ENDED) {
controlDispatcher.dispatchFastForward(player); controlDispatcher.dispatchFastForward(player);
}
} else if (rewindButton == view) { } else if (rewindButton == view) {
controlDispatcher.dispatchRewind(player); controlDispatcher.dispatchRewind(player);
} else if (playButton == view) { } else if (playButton == view) {