Merge pull request #488 from Silent1566/dev4

合并 beta（7c725e4d7ee）到 dev4 并修复 mobile 广告统计日志带的固定浅底前景
2026-10-25 10:16:33 +00:00 · 2026-10-24 19:39:18 +08:00 · 2026-10-24 19:39:18 +08:00 · 8322438787
commit 8322438787
parent 7c725e4d7e 306b823dc7
24 changed files with 1216 additions and 87 deletions
--- 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/layout/adapter_ad_block_log.xml
+++ b/app/src/leanback/res/layout/adapter_ad_block_log.xml
--- a/app/src/leanback/res/layout/adapter_ad_rule.xml
+++ b/app/src/leanback/res/layout/adapter_ad_rule.xml
--- a/app/src/leanback/res/layout/adapter_ad_stats_item.xml
+++ b/app/src/leanback/res/layout/adapter_ad_stats_item.xml
--- 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_exit_confirm.xml
+++ b/app/src/leanback/res/layout/dialog_exit_confirm.xml
--- a/app/src/leanback/res/layout/dialog_update.xml
+++ b/app/src/leanback/res/layout/dialog_update.xml
--- a/app/src/main/res/color/fixed_light_focus_icon.xml
+++ b/app/src/main/res/color/fixed_light_focus_icon.xml
--- a/app/src/main/res/color/fixed_light_focus_text.xml
+++ b/app/src/main/res/color/fixed_light_focus_text.xml
--- a/app/src/main/res/layout/adapter_custom_csp.xml
+++ b/app/src/main/res/layout/adapter_custom_csp.xml
--- a/app/src/main/res/layout/adapter_mpv_config_profile.xml
+++ b/app/src/main/res/layout/adapter_mpv_config_profile.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_custom_csp.xml
+++ b/app/src/main/res/layout/dialog_custom_csp.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_manager.xml
+++ b/app/src/main/res/layout/dialog_mpv_config_manager.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_update_settings.xml
+++ b/app/src/main/res/layout/dialog_update_settings.xml
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
--- a/app/src/mobile/res/layout/adapter_github_proxy.xml
+++ b/app/src/mobile/res/layout/adapter_github_proxy.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/test/java/com/fongmi/android/tv/theme/TvFixedLightSurfaceContrastTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/theme/TvFixedLightSurfaceContrastTest.java
--- a/docs/C103-beta-merge-review-dev4-20261024.md
+++ b/docs/C103-beta-merge-review-dev4-20261024.md
--- a/docs/TV-EXIT-CANCEL-CONTRAST-01-tv-exit-cancel-contrast.md
+++ b/docs/TV-EXIT-CANCEL-CONTRAST-01-tv-exit-cancel-contrast.md
--- a/docs/TV-LIGHT-FILL-CONTRAST-ALL-02-tv-fixed-light-surface-foregrounds.md
+++ b/docs/TV-LIGHT-FILL-CONTRAST-ALL-02-tv-fixed-light-surface-foregrounds.md