feat(osd): merge the xinyue badge expansion and equalize badge row height

Verification: :app:testMobileArm64_v8aDebugUnitTest (MediaBadgeResolverTest 27 tests + PlayerDisplaySettingSyncTest + ControlDialogOsdSettingsTest) BUILD SUCCESSFUL; :app:compileLeanbackArm64_v8aDebugJavaWithJavac SUCCESSFUL; :app:assembleMobileArm64_v8aDebug SUCCESSFUL (APK 204,566,448 bytes); device emulator-5554: 11 badges, uniform 35px rows, 港版 (ged_hk) + HDR Vivid (gvf_hdrvivid) plates rendered Task-Guard: osd-badge-expansion
2026-10-25 10:16:33 +00:00 · 2026-10-25 00:29:03 +08:00 · 2026-10-25 00:29:03 +08:00 · 11be83da8b
commit 11be83da8b
parent 192b55c2fc
33 changed files with 187 additions and 35 deletions
--- 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/ui/custom/PlayerOsdController.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/custom/PlayerOsdController.java
--- 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_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_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_vvc.webp
+++ b/app/src/main/res/drawable-nodpi/badge_ge_vvc.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_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_gr_8k.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gr_8k.webp
--- a/app/src/main/res/drawable-nodpi/badge_gv_10bit.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gv_10bit.webp
--- a/app/src/main/res/drawable-nodpi/badge_gv_12bit.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gv_12bit.webp
--- a/app/src/main/res/drawable-nodpi/badge_gv_8bit.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gv_8bit.webp
--- a/app/src/main/res/drawable-nodpi/badge_gvf_3d.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gvf_3d.webp
--- a/app/src/main/res/drawable-nodpi/badge_gvf_hdrvivid.webp
+++ b/app/src/main/res/drawable-nodpi/badge_gvf_hdrvivid.webp
--- a/app/src/test/java/com/fongmi/android/tv/player/MediaBadgeResolverTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/player/MediaBadgeResolverTest.java
--- a/docs/osd-media-badges.md
+++ b/docs/osd-media-badges.md