Merge remote-tracking branch 'origin/beta' into dev1

2026-10-25 10:16:33 +00:00 · 2026-10-21 18:27:09 +08:00 · 2026-10-21 18:27:09 +08:00 · 560d5e6263
commit 560d5e6263
parent d9a0cc5c69 3964eeae7c
25 changed files with 2242 additions and 39 deletions
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
--- a/app/src/leanback/res/drawable/selector_search_scope_item.xml
+++ b/app/src/leanback/res/drawable/selector_search_scope_item.xml
--- a/app/src/leanback/res/drawable/shape_keyboard_normal.xml
+++ b/app/src/leanback/res/drawable/shape_keyboard_normal.xml
--- a/app/src/main/java/com/fongmi/android/tv/player/exo/ExoDecoderRuntimeProfileStore.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/exo/ExoDecoderRuntimeProfileStore.java
--- a/app/src/main/java/com/fongmi/android/tv/player/exo/ExoDecoderRuntimeProfiles.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/exo/ExoDecoderRuntimeProfiles.java
--- a/app/src/main/java/com/fongmi/android/tv/player/exo/ExoRuntimeAwareVideoRenderer.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/exo/ExoRuntimeAwareVideoRenderer.java
--- a/app/src/main/java/com/fongmi/android/tv/player/exo/ExoUtil.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/exo/ExoUtil.java
--- a/app/src/main/java/com/fongmi/android/tv/setting/PlaybackPerformanceCatalog.java
+++ b/app/src/main/java/com/fongmi/android/tv/setting/PlaybackPerformanceCatalog.java
--- a/app/src/main/java/com/fongmi/android/tv/setting/PlaybackPerformanceSetting.java
+++ b/app/src/main/java/com/fongmi/android/tv/setting/PlaybackPerformanceSetting.java
--- a/app/src/main/res/drawable/selector_display_option.xml
+++ b/app/src/main/res/drawable/selector_display_option.xml
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
--- a/app/src/test/java/com/fongmi/android/tv/player/exo/ExoDecoderRuntimeProfilesSummaryTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/player/exo/ExoDecoderRuntimeProfilesSummaryTest.java
--- a/app/src/test/java/com/fongmi/android/tv/setting/FlagSwitchPlaybackWiringTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/setting/FlagSwitchPlaybackWiringTest.java
--- a/app/src/test/java/com/fongmi/android/tv/setting/PlaybackPerformanceSettingSourceTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/setting/PlaybackPerformanceSettingSourceTest.java
--- a/app/src/testLeanback/java/com/fongmi/android/tv/ui/activity/TvFocusStatePairContrastTest.java
+++ b/app/src/testLeanback/java/com/fongmi/android/tv/ui/activity/TvFocusStatePairContrastTest.java
--- a/app/src/testMobile/java/com/fongmi/android/tv/ui/activity/PlayerControlFocusIntegrationTest.java
+++ b/app/src/testMobile/java/com/fongmi/android/tv/ui/activity/PlayerControlFocusIntegrationTest.java
--- a/docs/C90-beta-merge-review-dev2-20261021.md
+++ b/docs/C90-beta-merge-review-dev2-20261021.md
--- a/docs/C91-beta-merge-review-dev3-20261021.md
+++ b/docs/C91-beta-merge-review-dev3-20261021.md
--- a/docs/C92-beta-merge-review-dev2-20261021.md
+++ b/docs/C92-beta-merge-review-dev2-20261021.md
--- a/docs/C92-beta-merge-review-dev4-20261021.md
+++ b/docs/C92-beta-merge-review-dev4-20261021.md
--- a/docs/E-SP11-exo-tv-frame-drop-defaults.md
+++ b/docs/E-SP11-exo-tv-frame-drop-defaults.md
--- a/docs/TV-ENDING-SHORTCUT-20261021-ending-shortcut.md
+++ b/docs/TV-ENDING-SHORTCUT-20261021-ending-shortcut.md
--- a/docs/TV-FOCUS-PAIR-20261021.md
+++ b/docs/TV-FOCUS-PAIR-20261021.md
--- a/docs/upstream-player-dependency-merge-assessment-2026-08-20.md
+++ b/docs/upstream-player-dependency-merge-assessment-2026-08-20.md
--- a/scripts/verify_scope_focus_contrast.py
+++ b/scripts/verify_scope_focus_contrast.py