merge: 合并 origin/beta e0cb0ea2d5（PR #460-#462）并复评 dev2 未推送提交

2026-10-25 10:16:33 +00:00 · 2026-10-20 11:22:30 +08:00 · 2026-10-20 11:22:30 +08:00 · c5323524c1
commit c5323524c1
parent ad7f5834de e0cb0ea2d5
56 changed files with 1694 additions and 122 deletions
--- a/app/src/leanback/res/layout/dialog_ad_block_stats.xml
+++ b/app/src/leanback/res/layout/dialog_ad_block_stats.xml
--- a/app/src/leanback/res/layout/dialog_ad_rule_edit.xml
+++ b/app/src/leanback/res/layout/dialog_ad_rule_edit.xml
--- a/app/src/leanback/res/layout/dialog_ad_rule_preview.xml
+++ b/app/src/leanback/res/layout/dialog_ad_rule_preview.xml
--- a/app/src/leanback/res/layout/dialog_config.xml
+++ b/app/src/leanback/res/layout/dialog_config.xml
--- a/app/src/leanback/res/layout/dialog_ua.xml
+++ b/app/src/leanback/res/layout/dialog_ua.xml
--- a/app/src/leanback/res/layout/dialog_update.xml
+++ b/app/src/leanback/res/layout/dialog_update.xml
--- a/app/src/main/java/com/fongmi/android/tv/ui/dialog/PlaybackRemoteSyncDialog.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/dialog/PlaybackRemoteSyncDialog.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/dialog/PlaybackWebhookDialog.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/dialog/PlaybackWebhookDialog.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/dialog/ViewingRecordSyncDialog.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/dialog/ViewingRecordSyncDialog.java
--- a/app/src/main/res/color/about_primary_icon_tint.xml
+++ b/app/src/main/res/color/about_primary_icon_tint.xml
--- a/app/src/main/res/color/dialog_primary_button_bg.xml
+++ b/app/src/main/res/color/dialog_primary_button_bg.xml
--- a/app/src/main/res/color/dialog_primary_button_text.xml
+++ b/app/src/main/res/color/dialog_primary_button_text.xml
--- a/app/src/main/res/color/focus_ring_primary_container.xml
+++ b/app/src/main/res/color/focus_ring_primary_container.xml
--- a/app/src/main/res/color/update_version_item_accent.xml
+++ b/app/src/main/res/color/update_version_item_accent.xml
--- a/app/src/main/res/color/update_version_item_meta.xml
+++ b/app/src/main/res/color/update_version_item_meta.xml
--- a/app/src/main/res/color/update_version_item_title.xml
+++ b/app/src/main/res/color/update_version_item_title.xml
--- a/app/src/main/res/drawable/about_primary_icon_button.xml
+++ b/app/src/main/res/drawable/about_primary_icon_button.xml
--- a/app/src/main/res/drawable/selector_update_version_item.xml
+++ b/app/src/main/res/drawable/selector_update_version_item.xml
--- a/app/src/main/res/layout/dialog_about.xml
+++ b/app/src/main/res/layout/dialog_about.xml
--- a/app/src/main/res/layout/dialog_ai_recommendation_info.xml
+++ b/app/src/main/res/layout/dialog_ai_recommendation_info.xml
--- a/app/src/main/res/layout/dialog_apk_push_progress.xml
+++ b/app/src/main/res/layout/dialog_apk_push_progress.xml
--- a/app/src/main/res/layout/dialog_custom_csp.xml
+++ b/app/src/main/res/layout/dialog_custom_csp.xml
--- a/app/src/main/res/layout/dialog_login_state_learn.xml
+++ b/app/src/main/res/layout/dialog_login_state_learn.xml
--- a/app/src/main/res/layout/dialog_login_state_path.xml
+++ b/app/src/main/res/layout/dialog_login_state_path.xml
--- a/app/src/main/res/layout/dialog_manage_page.xml
+++ b/app/src/main/res/layout/dialog_manage_page.xml
--- a/app/src/main/res/layout/dialog_manage_page_battery.xml
+++ b/app/src/main/res/layout/dialog_manage_page_battery.xml
--- a/app/src/main/res/layout/dialog_mpv_config_create.xml
+++ b/app/src/main/res/layout/dialog_mpv_config_create.xml
--- a/app/src/main/res/layout/dialog_mpv_config_rename.xml
+++ b/app/src/main/res/layout/dialog_mpv_config_rename.xml
--- a/app/src/main/res/layout/dialog_one_key_sync.xml
+++ b/app/src/main/res/layout/dialog_one_key_sync.xml
--- a/app/src/main/res/layout/dialog_playback_remote_sync.xml
+++ b/app/src/main/res/layout/dialog_playback_remote_sync.xml
--- a/app/src/main/res/layout/dialog_playback_webhook.xml
+++ b/app/src/main/res/layout/dialog_playback_webhook.xml
--- a/app/src/main/res/layout/dialog_remote_trust_add_device.xml
+++ b/app/src/main/res/layout/dialog_remote_trust_add_device.xml
--- a/app/src/main/res/layout/dialog_remote_trust_confirm.xml
+++ b/app/src/main/res/layout/dialog_remote_trust_confirm.xml
--- a/app/src/main/res/layout/dialog_remote_trust_text_command.xml
+++ b/app/src/main/res/layout/dialog_remote_trust_text_command.xml
--- a/app/src/main/res/layout/dialog_result_list.xml
+++ b/app/src/main/res/layout/dialog_result_list.xml
--- a/app/src/main/res/layout/dialog_shell_proxy.xml
+++ b/app/src/main/res/layout/dialog_shell_proxy.xml
--- a/app/src/main/res/layout/dialog_site_health.xml
+++ b/app/src/main/res/layout/dialog_site_health.xml
--- a/app/src/main/res/layout/dialog_site_health_report.xml
+++ b/app/src/main/res/layout/dialog_site_health_report.xml
--- a/app/src/main/res/layout/dialog_sync_path.xml
+++ b/app/src/main/res/layout/dialog_sync_path.xml
--- a/app/src/main/res/layout/dialog_update_settings.xml
+++ b/app/src/main/res/layout/dialog_update_settings.xml
--- a/app/src/main/res/layout/dialog_viewing_record_sync.xml
+++ b/app/src/main/res/layout/dialog_viewing_record_sync.xml
--- a/app/src/main/res/layout/dialog_web_home_extension.xml
+++ b/app/src/main/res/layout/dialog_web_home_extension.xml
--- a/app/src/main/res/layout/dialog_web_home_extension_debug.xml
+++ b/app/src/main/res/layout/dialog_web_home_extension_debug.xml
--- a/app/src/main/res/layout/item_following.xml
+++ b/app/src/main/res/layout/item_following.xml
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
--- a/app/src/mobile/res/layout/activity_crash.xml
+++ b/app/src/mobile/res/layout/activity_crash.xml
--- a/app/src/mobile/res/layout/dialog_ad_block_stats.xml
+++ b/app/src/mobile/res/layout/dialog_ad_block_stats.xml
--- a/app/src/mobile/res/layout/dialog_apk_push_method.xml
+++ b/app/src/mobile/res/layout/dialog_apk_push_method.xml
--- a/app/src/mobile/res/layout/dialog_config.xml
+++ b/app/src/mobile/res/layout/dialog_config.xml
--- a/app/src/mobile/res/layout/dialog_update.xml
+++ b/app/src/mobile/res/layout/dialog_update.xml
--- a/app/src/test/java/com/fongmi/android/tv/theme/DialogForegroundTokenTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/theme/DialogForegroundTokenTest.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/docs/C83-beta-merge-review-dev4-20261019.md
+++ b/docs/C83-beta-merge-review-dev4-20261019.md
--- a/docs/TV-FOCUS-RING-DIALOG-20261019.md
+++ b/docs/TV-FOCUS-RING-DIALOG-20261019.md
--- a/docs/upstream-player-dependency-merge-assessment-2026-08-20.md
+++ b/docs/upstream-player-dependency-merge-assessment-2026-08-20.md
--- a/docs/viewing-record-sync-dark-theme-20261019.md
+++ b/docs/viewing-record-sync-dark-theme-20261019.md