Commit 6f686be7 by olly Committed by Oliver Woodman

Workaround for focus issues on API levels less than 26

Issue: #9061
PiperOrigin-RevId: 380640601
parent 81c542b6
...@@ -41,6 +41,10 @@ ...@@ -41,6 +41,10 @@
* Remove `CastPlayer` specific playlist manipulation methods. Use * Remove `CastPlayer` specific playlist manipulation methods. Use
`setMediaItems`, `addMediaItems`, `removeMediaItem` and `moveMediaItem` `setMediaItems`, `addMediaItems`, `removeMediaItem` and `moveMediaItem`
instead. instead.
* UI
* Fix focusability of `StyledPlayerView` and `StyledPlayerControlView`
popup menus on API levels prior to 26
([#9061](https://github.com/google/ExoPlayer/issues/9061)).
* Video: * Video:
* Fix `IncorrectContextUseViolation` strict mode warning on Android 11 * Fix `IncorrectContextUseViolation` strict mode warning on Android 11
([#8246](https://github.com/google/ExoPlayer/pull/8246)). ([#8246](https://github.com/google/ExoPlayer/pull/8246)).
......
...@@ -1926,6 +1926,10 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -1926,6 +1926,10 @@ public class StyledPlayerControlView extends FrameLayout {
public SettingViewHolder(View itemView) { public SettingViewHolder(View itemView) {
super(itemView); super(itemView);
if (Util.SDK_INT < 26) {
// Workaround for https://github.com/google/ExoPlayer/issues/9061.
itemView.setFocusable(true);
}
mainTextView = itemView.findViewById(R.id.exo_main_text); mainTextView = itemView.findViewById(R.id.exo_main_text);
subTextView = itemView.findViewById(R.id.exo_sub_text); subTextView = itemView.findViewById(R.id.exo_sub_text);
iconView = itemView.findViewById(R.id.exo_icon); iconView = itemView.findViewById(R.id.exo_icon);
...@@ -2252,6 +2256,10 @@ public class StyledPlayerControlView extends FrameLayout { ...@@ -2252,6 +2256,10 @@ public class StyledPlayerControlView extends FrameLayout {
public SubSettingViewHolder(View itemView) { public SubSettingViewHolder(View itemView) {
super(itemView); super(itemView);
if (Util.SDK_INT < 26) {
// Workaround for https://github.com/google/ExoPlayer/issues/9061.
itemView.setFocusable(true);
}
textView = itemView.findViewById(R.id.exo_text); textView = itemView.findViewById(R.id.exo_text);
checkView = itemView.findViewById(R.id.exo_check); checkView = itemView.findViewById(R.id.exo_check);
} }
......
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