merge: 合并 origin/beta ee285f8e85 并评审 dev4 未推送修复

Verification: merge origin/beta ee285f8e85 零冲突零 blob 改写; 编译双flavor BUILD SUCCESSFUL EXIT=0; 单测 305 例 0 失败 (mobile FlagSwitchPlaybackWiringTest 8/0/0 VideoActivityLayoutTest 155/0/0 TmdbDetailActivityLayoutTest 130/0/0 TvFixedLightSurfaceContrastTest 4/0/0; leanback FlagSwitchPlaybackWiringTest 8/0/0) Task-Guard: C105-BETA-MERGE-DEV4-20261025
2026-10-25 10:16:33 +00:00 · 2026-10-25 11:50:24 +08:00 · 2026-10-25 11:50:24 +08:00 · db0b4483b3
commit db0b4483b3
parent 772a25a454 ee285f8e85
155 changed files with 2126 additions and 13 deletions
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ControlDialog.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ControlDialog.java
--- a/app/src/leanback/res/layout/activity_setting_player.xml
+++ b/app/src/leanback/res/layout/activity_setting_player.xml
--- a/app/src/leanback/res/layout/dialog_control.xml
+++ b/app/src/leanback/res/layout/dialog_control.xml
--- a/app/src/main/java/com/fongmi/android/tv/bean/Backup.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Backup.java
--- a/app/src/main/java/com/fongmi/android/tv/player/AudioPlaybackDiagnostics.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/AudioPlaybackDiagnostics.java
--- a/app/src/main/java/com/fongmi/android/tv/player/MediaBadgeCatalog.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/MediaBadgeCatalog.java
--- a/app/src/main/java/com/fongmi/android/tv/player/MediaBadgeResolver.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/MediaBadgeResolver.java
--- a/app/src/main/java/com/fongmi/android/tv/setting/PlayerSetting.java
+++ b/app/src/main/java/com/fongmi/android/tv/setting/PlayerSetting.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/custom/PlayerOsdController.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/custom/PlayerOsdController.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/dialog/DisplayDialog.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/dialog/DisplayDialog.java
--- a/app/src/main/res/drawable-nodpi/badge_ga_aac.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ga_aac.webp
--- a/app/src/main/res/drawable-nodpi/badge_ga_dolby_atmos.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ga_dolby_atmos.webp
--- a/app/src/main/res/drawable-nodpi/badge_ga_dolby_atmos_digital_plus.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ga_dolby_atmos_digital_plus.webp
--- a/app/src/main/res/drawable-nodpi/badge_ga_dolby_atmos_truehd.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ga_dolby_atmos_truehd.webp
--- a/app/src/main/res/drawable-nodpi/badge_ga_dolby_digital.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ga_dolby_digital.webp
--- a/app/src/main/res/drawable-nodpi/badge_ga_dolby_digital_plus.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ga_dolby_digital_plus.webp
--- a/app/src/main/res/drawable-nodpi/badge_ga_dolby_truehd.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ga_dolby_truehd.webp
--- a/app/src/main/res/drawable-nodpi/badge_ga_dts.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ga_dts.webp
--- a/app/src/main/res/drawable-nodpi/badge_ga_dts_es.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ga_dts_es.webp
--- a/app/src/main/res/drawable-nodpi/badge_ga_dts_hd.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ga_dts_hd.webp
--- a/app/src/main/res/drawable-nodpi/badge_ga_dts_hd_ma.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ga_dts_hd_ma.webp
--- a/app/src/main/res/drawable-nodpi/badge_ga_dts_x.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ga_dts_x.webp
--- a/app/src/main/res/drawable-nodpi/badge_ga_dts_x_hd.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ga_dts_x_hd.webp
--- a/app/src/main/res/drawable-nodpi/badge_ga_dts_x_hd_ma.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ga_dts_x_hd_ma.webp
--- a/app/src/main/res/drawable-nodpi/badge_ga_flac.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ga_flac.webp
--- a/app/src/main/res/drawable-nodpi/badge_ga_lossless.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ga_lossless.webp
--- a/app/src/main/res/drawable-nodpi/badge_ga_lpcm.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ga_lpcm.webp
--- a/app/src/main/res/drawable-nodpi/badge_ga_opus.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ga_opus.webp
--- a/app/src/main/res/drawable-nodpi/badge_gc_2_0.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gc_2_0.webp
--- a/app/src/main/res/drawable-nodpi/badge_gc_5_1.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gc_5_1.webp
--- a/app/src/main/res/drawable-nodpi/badge_gc_5_1_2.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gc_5_1_2.webp
--- a/app/src/main/res/drawable-nodpi/badge_gc_5_1_4.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gc_5_1_4.webp
--- a/app/src/main/res/drawable-nodpi/badge_gc_6_1.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gc_6_1.webp
--- a/app/src/main/res/drawable-nodpi/badge_gc_7_1.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gc_7_1.webp
--- a/app/src/main/res/drawable-nodpi/badge_gc_7_1_4.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gc_7_1_4.webp
--- a/app/src/main/res/drawable-nodpi/badge_ge_av1.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ge_av1.webp
--- a/app/src/main/res/drawable-nodpi/badge_ge_avc.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ge_avc.webp
--- a/app/src/main/res/drawable-nodpi/badge_ge_divx.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ge_divx.webp
--- a/app/src/main/res/drawable-nodpi/badge_ge_hevc.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ge_hevc.webp
--- a/app/src/main/res/drawable-nodpi/badge_ge_vvc.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ge_vvc.webp
--- a/app/src/main/res/drawable-nodpi/badge_ge_xvid.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ge_xvid.webp
--- a/app/src/main/res/drawable-nodpi/badge_ged_allregion.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ged_allregion.webp
--- a/app/src/main/res/drawable-nodpi/badge_ged_arrow.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ged_arrow.webp
--- a/app/src/main/res/drawable-nodpi/badge_ged_cc.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ged_cc.webp
--- a/app/src/main/res/drawable-nodpi/badge_ged_de.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ged_de.webp
--- a/app/src/main/res/drawable-nodpi/badge_ged_dieying.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ged_dieying.webp
--- a/app/src/main/res/drawable-nodpi/badge_ged_eu.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ged_eu.webp
--- a/app/src/main/res/drawable-nodpi/badge_ged_fr.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ged_fr.webp
--- a/app/src/main/res/drawable-nodpi/badge_ged_hk.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ged_hk.webp
--- a/app/src/main/res/drawable-nodpi/badge_ged_jp.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ged_jp.webp
--- a/app/src/main/res/drawable-nodpi/badge_ged_kr.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ged_kr.webp
--- a/app/src/main/res/drawable-nodpi/badge_ged_tw.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ged_tw.webp
--- a/app/src/main/res/drawable-nodpi/badge_ged_uk.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ged_uk.webp
--- a/app/src/main/res/drawable-nodpi/badge_ged_us.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ged_us.webp
--- a/app/src/main/res/drawable-nodpi/badge_gfr_hfr.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gfr_hfr.webp
--- a/app/src/main/res/drawable-nodpi/badge_gms_blu_ray_1.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gms_blu_ray_1.webp
--- a/app/src/main/res/drawable-nodpi/badge_gms_blu_ray_2.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gms_blu_ray_2.webp
--- a/app/src/main/res/drawable-nodpi/badge_gms_blu_ray_3.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gms_blu_ray_3.webp
--- a/app/src/main/res/drawable-nodpi/badge_gms_blu_ray_4.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gms_blu_ray_4.webp
--- a/app/src/main/res/drawable-nodpi/badge_gms_blu_ray_5.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gms_blu_ray_5.webp
--- a/app/src/main/res/drawable-nodpi/badge_gms_blu_ray_6.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gms_blu_ray_6.webp
--- a/app/src/main/res/drawable-nodpi/badge_gms_blu_ray_7.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gms_blu_ray_7.webp
--- a/app/src/main/res/drawable-nodpi/badge_gms_blu_ray_8.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gms_blu_ray_8.webp
--- a/app/src/main/res/drawable-nodpi/badge_gms_high_bitrate.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gms_high_bitrate.webp
--- a/app/src/main/res/drawable-nodpi/badge_gms_iso.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gms_iso.webp
--- a/app/src/main/res/drawable-nodpi/badge_gms_remux_1.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gms_remux_1.webp
--- a/app/src/main/res/drawable-nodpi/badge_gms_remux_2.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gms_remux_2.webp
--- a/app/src/main/res/drawable-nodpi/badge_gms_remux_3.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gms_remux_3.webp
--- a/app/src/main/res/drawable-nodpi/badge_gms_web_1.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gms_web_1.webp
--- a/app/src/main/res/drawable-nodpi/badge_gms_web_2.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gms_web_2.webp
--- a/app/src/main/res/drawable-nodpi/badge_gms_web_3.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gms_web_3.webp
--- a/app/src/main/res/drawable-nodpi/badge_gms_web_4.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gms_web_4.webp
--- a/app/src/main/res/drawable-nodpi/badge_gms_web_5.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gms_web_5.webp
--- a/app/src/main/res/drawable-nodpi/badge_gms_web_6.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gms_web_6.webp
--- a/app/src/main/res/drawable-nodpi/badge_gq_bluray.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gq_bluray.webp
--- a/app/src/main/res/drawable-nodpi/badge_gq_cam.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gq_cam.webp
--- a/app/src/main/res/drawable-nodpi/badge_gq_dvdrip.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gq_dvdrip.webp
--- a/app/src/main/res/drawable-nodpi/badge_gq_hc_hdrip.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gq_hc_hdrip.webp
--- a/app/src/main/res/drawable-nodpi/badge_gq_hdrip.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gq_hdrip.webp
--- a/app/src/main/res/drawable-nodpi/badge_gq_hdtv.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gq_hdtv.webp
--- a/app/src/main/res/drawable-nodpi/badge_gq_remux.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gq_remux.webp
--- a/app/src/main/res/drawable-nodpi/badge_gq_scr.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gq_scr.webp
--- a/app/src/main/res/drawable-nodpi/badge_gq_tc.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gq_tc.webp
--- a/app/src/main/res/drawable-nodpi/badge_gq_ts.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gq_ts.webp
--- a/app/src/main/res/drawable-nodpi/badge_gq_web_dl.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gq_web_dl.webp
--- a/app/src/main/res/drawable-nodpi/badge_gq_webrip.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gq_webrip.webp
--- a/app/src/main/res/drawable-nodpi/badge_gr_1080p.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gr_1080p.webp
--- a/app/src/main/res/drawable-nodpi/badge_gr_1440p.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gr_1440p.webp
--- a/app/src/main/res/drawable-nodpi/badge_gr_144p.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gr_144p.webp
--- a/app/src/main/res/drawable-nodpi/badge_gr_240p.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gr_240p.webp
--- a/app/src/main/res/drawable-nodpi/badge_gr_360p.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gr_360p.webp
--- a/app/src/main/res/drawable-nodpi/badge_gr_480p.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gr_480p.webp
--- a/app/src/main/res/drawable-nodpi/badge_gr_4k.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gr_4k.webp
--- a/app/src/main/res/drawable-nodpi/badge_gr_576p.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gr_576p.webp
--- a/app/src/main/res/drawable-nodpi/badge_gr_720p.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gr_720p.webp
--- a/app/src/main/res/drawable-nodpi/badge_gr_8k.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gr_8k.webp
--- a/app/src/main/res/drawable-nodpi/badge_gs_apple_tv_plus.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gs_apple_tv_plus.webp
--- a/app/src/main/res/drawable-nodpi/badge_gs_crunchyroll.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gs_crunchyroll.webp
--- a/app/src/main/res/drawable-nodpi/badge_gs_disney_plus.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gs_disney_plus.webp
--- a/Show more
+++ b/Show more