merge: 合并 origin/beta 最新代码（PR#434 dev1 主题焦点环族 11 提交）并复评 dev2 已提交未推送的「退出播放页必定停播」修复

Verification: 以新 beta tip 重新合入：git merge --no-commit --no-ff origin/beta 0 冲突（MERGE_HEAD=3148f030df），索引树 c681b54c == git merge-tree --write-tree 自动合并结果树；净差异仅 dev2 自身 3 路径、--diff-filter=D 为空；零复活：47 条 beta 真移除路径在合并结果树命中 0、66 条与净差异交集 0、关键词命中 0；dev2 两改动文件 blob 逐字节未变；双 flavor 编译 4/4 BUILD SUCCESSFUL；全量 JVM 套件 leanback 4174/8 失败/7 类、mobile 4989/7 失败/6 类，失败类集合与文档基线同族（0 新增失败）；PlaybackOwnershipSourceTest 双 flavor 18/18 通过（含两条新增契约用例） Task-Guard: C58-beta-merge-dev2-beta434
2026-10-13 18:27:10 +00:00 · 2026-10-11 11:57:39 +08:00 · 2026-10-11 11:57:39 +08:00 · 8f20fab65a
commit 8f20fab65a
parent c27f34b950 3148f030df
84 changed files with 3492 additions and 309 deletions
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/TmdbRecommendationPresenter.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/TmdbRecommendationPresenter.java
--- a/app/src/leanback/res/drawable/selector_ad_stats_item.xml
+++ b/app/src/leanback/res/drawable/selector_ad_stats_item.xml
--- a/app/src/leanback/res/drawable/selector_control_sheet_button.xml
+++ b/app/src/leanback/res/drawable/selector_control_sheet_button.xml
--- a/app/src/leanback/res/drawable/selector_danmaku_result_item.xml
+++ b/app/src/leanback/res/drawable/selector_danmaku_result_item.xml
--- a/app/src/leanback/res/drawable/selector_danmaku_search_action.xml
+++ b/app/src/leanback/res/drawable/selector_danmaku_search_action.xml
--- a/app/src/leanback/res/drawable/selector_episode_dialog_item.xml
+++ b/app/src/leanback/res/drawable/selector_episode_dialog_item.xml
--- a/app/src/leanback/res/drawable/selector_episode_dialog_page.xml
+++ b/app/src/leanback/res/drawable/selector_episode_dialog_page.xml
--- a/app/src/leanback/res/drawable/selector_exit_confirm_primary.xml
+++ b/app/src/leanback/res/drawable/selector_exit_confirm_primary.xml
--- a/app/src/leanback/res/drawable/selector_exit_confirm_secondary.xml
+++ b/app/src/leanback/res/drawable/selector_exit_confirm_secondary.xml
--- 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/selector_video_item.xml
+++ b/app/src/leanback/res/drawable/selector_video_item.xml
--- a/app/src/leanback/res/drawable/shape_chip_activated.xml
+++ b/app/src/leanback/res/drawable/shape_chip_activated.xml
--- a/app/src/leanback/res/drawable/shape_chip_focused.xml
+++ b/app/src/leanback/res/drawable/shape_chip_focused.xml
--- a/app/src/leanback/res/drawable/shape_chip_round_activated.xml
+++ b/app/src/leanback/res/drawable/shape_chip_round_activated.xml
--- a/app/src/leanback/res/drawable/shape_chip_round_focused.xml
+++ b/app/src/leanback/res/drawable/shape_chip_round_focused.xml
--- a/app/src/leanback/res/drawable/shape_config_history_item_focused.xml
+++ b/app/src/leanback/res/drawable/shape_config_history_item_focused.xml
--- a/app/src/leanback/res/drawable/shape_group_button_focused.xml
+++ b/app/src/leanback/res/drawable/shape_group_button_focused.xml
--- a/app/src/leanback/res/drawable/shape_item_focused.xml
+++ b/app/src/leanback/res/drawable/shape_item_focused.xml
--- a/app/src/leanback/res/drawable/shape_item_round_focused.xml
+++ b/app/src/leanback/res/drawable/shape_item_round_focused.xml
--- a/app/src/leanback/res/drawable/shape_item_selected.xml
+++ b/app/src/leanback/res/drawable/shape_item_selected.xml
--- a/app/src/leanback/res/drawable/shape_keyboard_focused.xml
+++ b/app/src/leanback/res/drawable/shape_keyboard_focused.xml
--- a/app/src/leanback/res/drawable/shape_live_focused.xml
+++ b/app/src/leanback/res/drawable/shape_live_focused.xml
--- a/app/src/leanback/res/drawable/shape_search_hot_word_focused.xml
+++ b/app/src/leanback/res/drawable/shape_search_hot_word_focused.xml
--- a/app/src/leanback/res/drawable/shape_site_item_focused.xml
+++ b/app/src/leanback/res/drawable/shape_site_item_focused.xml
--- a/app/src/leanback/res/drawable/shape_site_item_selected.xml
+++ b/app/src/leanback/res/drawable/shape_site_item_selected.xml
--- a/app/src/leanback/res/drawable/shape_subtitle_focused.xml
+++ b/app/src/leanback/res/drawable/shape_subtitle_focused.xml
--- a/app/src/leanback/res/drawable/shape_subtitle_pressed.xml
+++ b/app/src/leanback/res/drawable/shape_subtitle_pressed.xml
--- a/app/src/leanback/res/drawable/shape_video_focused.xml
+++ b/app/src/leanback/res/drawable/shape_video_focused.xml
--- a/app/src/leanback/res/drawable/shape_video_item_focused.xml
+++ b/app/src/leanback/res/drawable/shape_video_item_focused.xml
--- a/app/src/leanback/res/drawable/shape_vod_focused.xml
+++ b/app/src/leanback/res/drawable/shape_vod_focused.xml
--- a/app/src/leanback/res/drawable/shape_vod_oval_focused.xml
+++ b/app/src/leanback/res/drawable/shape_vod_oval_focused.xml
--- a/app/src/leanback/res/layout/adapter_vod.xml
+++ b/app/src/leanback/res/layout/adapter_vod.xml
--- a/app/src/leanback/res/layout/dialog_episode_list.xml
+++ b/app/src/leanback/res/layout/dialog_episode_list.xml
--- a/app/src/leanback/res/layout/dialog_quick_search.xml
+++ b/app/src/leanback/res/layout/dialog_quick_search.xml
--- a/app/src/leanback/res/layout/view_progress.xml
+++ b/app/src/leanback/res/layout/view_progress.xml
--- a/app/src/leanback/res/values/styles.xml
+++ b/app/src/leanback/res/values/styles.xml
--- a/app/src/main/java/com/fongmi/android/tv/theme/ThemeController.java
+++ b/app/src/main/java/com/fongmi/android/tv/theme/ThemeController.java
--- a/app/src/main/java/com/fongmi/android/tv/theme/ThemeEditor.java
+++ b/app/src/main/java/com/fongmi/android/tv/theme/ThemeEditor.java
--- a/app/src/main/java/com/fongmi/android/tv/theme/ThemePresets.java
+++ b/app/src/main/java/com/fongmi/android/tv/theme/ThemePresets.java
--- a/app/src/main/java/com/fongmi/android/tv/theme/ThemePreviewView.java
+++ b/app/src/main/java/com/fongmi/android/tv/theme/ThemePreviewView.java
--- a/app/src/main/java/com/fongmi/android/tv/theme/ThemeProfile.java
+++ b/app/src/main/java/com/fongmi/android/tv/theme/ThemeProfile.java
--- a/app/src/main/java/com/fongmi/android/tv/theme/ThemeProfileValidator.java
+++ b/app/src/main/java/com/fongmi/android/tv/theme/ThemeProfileValidator.java
--- a/app/src/main/java/com/fongmi/android/tv/theme/ThemeResolver.java
+++ b/app/src/main/java/com/fongmi/android/tv/theme/ThemeResolver.java
--- a/app/src/main/java/com/fongmi/android/tv/theme/ThemeTokens.java
+++ b/app/src/main/java/com/fongmi/android/tv/theme/ThemeTokens.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/activity/TmdbDetailActivity.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/activity/TmdbDetailActivity.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/adapter/InlineEpisodeAdapter.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/adapter/InlineEpisodeAdapter.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/adapter/TmdbCardFocusHelper.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/adapter/TmdbCardFocusHelper.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/adapter/TmdbEpisodeAdapter.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/adapter/TmdbEpisodeAdapter.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/adapter/TmdbVideoAdapter.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/adapter/TmdbVideoAdapter.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/dialog/CacheManagementDialog.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/dialog/CacheManagementDialog.java
--- a/app/src/main/res/color/following_button_primary_text.xml
+++ b/app/src/main/res/color/following_button_primary_text.xml
--- a/app/src/main/res/color/following_button_secondary_text.xml
+++ b/app/src/main/res/color/following_button_secondary_text.xml
--- a/app/src/main/res/drawable/selector_cache_button_focus.xml
+++ b/app/src/main/res/drawable/selector_cache_button_focus.xml
--- a/app/src/main/res/drawable/selector_episode_card.xml
+++ b/app/src/main/res/drawable/selector_episode_card.xml
--- a/app/src/main/res/drawable/selector_tmdb_cast_focus.xml
+++ b/app/src/main/res/drawable/selector_tmdb_cast_focus.xml
--- a/app/src/main/res/drawable/selector_tmdb_media_focus.xml
+++ b/app/src/main/res/drawable/selector_tmdb_media_focus.xml
--- a/app/src/main/res/drawable/shape_episode_photo_focused.xml
+++ b/app/src/main/res/drawable/shape_episode_photo_focused.xml
--- a/app/src/main/res/layout/dialog_cache_management.xml
+++ b/app/src/main/res/layout/dialog_cache_management.xml
--- a/app/src/main/res/values-night/webhtv_tokens.xml
+++ b/app/src/main/res/values-night/webhtv_tokens.xml
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
--- a/app/src/main/res/values/webhtv_attrs.xml
+++ b/app/src/main/res/values/webhtv_attrs.xml
--- a/app/src/main/res/values/webhtv_dimens.xml
+++ b/app/src/main/res/values/webhtv_dimens.xml
--- a/app/src/main/res/values/webhtv_styles.xml
+++ b/app/src/main/res/values/webhtv_styles.xml
--- a/app/src/main/res/values/webhtv_tokens.xml
+++ b/app/src/main/res/values/webhtv_tokens.xml
--- a/app/src/mobile/res/layout/dialog_cache_management.xml
+++ b/app/src/mobile/res/layout/dialog_cache_management.xml
--- a/app/src/mobile/res/layout/view_progress.xml
+++ b/app/src/mobile/res/layout/view_progress.xml
--- a/app/src/mobile/res/values/styles.xml
+++ b/app/src/mobile/res/values/styles.xml
--- a/app/src/test/java/com/fongmi/android/tv/theme/ThemeContractTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/theme/ThemeContractTest.java
--- a/app/src/test/java/com/fongmi/android/tv/theme/ThemeControllerContractTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/theme/ThemeControllerContractTest.java
--- a/app/src/testLeanback/java/com/fongmi/android/tv/theme/LightDialogShellOpacityTest.java
+++ b/app/src/testLeanback/java/com/fongmi/android/tv/theme/LightDialogShellOpacityTest.java
--- a/app/src/testLeanback/java/com/fongmi/android/tv/ui/activity/NativeEnhancedPlaybackStyleFocusTest.java
+++ b/app/src/testLeanback/java/com/fongmi/android/tv/ui/activity/NativeEnhancedPlaybackStyleFocusTest.java
--- a/app/src/testLeanback/java/com/fongmi/android/tv/ui/activity/TvAppSurfaceFocusRingDeviceTest.java
+++ b/app/src/testLeanback/java/com/fongmi/android/tv/ui/activity/TvAppSurfaceFocusRingDeviceTest.java
--- a/app/src/testLeanback/java/com/fongmi/android/tv/ui/activity/TvFocusRingContractTest.java
+++ b/app/src/testLeanback/java/com/fongmi/android/tv/ui/activity/TvFocusRingContractTest.java
--- a/app/src/testMobile/java/com/fongmi/android/tv/ui/activity/TmdbDetailActivityLayoutTest.java
+++ b/app/src/testMobile/java/com/fongmi/android/tv/ui/activity/TmdbDetailActivityLayoutTest.java
--- a/app/src/testMobile/java/com/fongmi/android/tv/ui/activity/VideoActivityLayoutTest.java
+++ b/app/src/testMobile/java/com/fongmi/android/tv/ui/activity/VideoActivityLayoutTest.java
--- a/app/src/testMobile/java/com/fongmi/android/tv/ui/dialog/InterfaceEntryInteractionTest.java
+++ b/app/src/testMobile/java/com/fongmi/android/tv/ui/dialog/InterfaceEntryInteractionTest.java
--- a/docs/C58-beta-merge-review-dev1-20261011.md
+++ b/docs/C58-beta-merge-review-dev1-20261011.md
--- a/docs/C58-beta-merge-review-dev2-20261011.md
+++ b/docs/C58-beta-merge-review-dev2-20261011.md
--- a/docs/TV-FOCUS-RING-20261004-unified-theme-ring.md
+++ b/docs/TV-FOCUS-RING-20261004-unified-theme-ring.md
--- a/docs/webhtv-unified-visual-design-system-20260920.md
+++ b/docs/webhtv-unified-visual-design-system-20260920.md