merge+review(C99): 合并 origin/beta 275c225edc 并评审两个未推送 TV 改动（视轨焦点/选中分离、内容区铺满窗口），修正 inset 守卫空转与注释比值

Browse source

Verification: leanback:testLeanbackArm64_v8aDebugUnitTest TrackUtilTest(10)+TvContentInsetContractTest(3)+TvFocusStatePairContrastTest(4)+TvFocusRingContractTest(27) 全绿；mobile:testMobileArm64_v8aDebugUnitTest DialogGlassChipStyleTest(6) 全绿；合并 0 冲突、路径交集 0；git diff --check 通过

Task-Guard: C99-BETA-MERGE-DEV1-20261022

...

This commit is contained in:

Silent1566 2026-10-22 19:18:06 +08:00

parent e90de26e63 275c225edc

commit d6b5d4cf4f

34 changed files with 2409 additions and 122 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

72

app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java

View file

5

app/src/main/java/com/fongmi/android/tv/player/PlaybackTelemetryMapper.java

View file

11

app/src/main/java/com/fongmi/android/tv/player/exo/ExoDiagnosticCollector.java

View file

32

app/src/main/java/com/fongmi/android/tv/player/exo/ExoFrameSchedulingRendererSettings.java

View file

19

app/src/main/java/com/fongmi/android/tv/player/exo/ExoPlaybackDiagnostics.java

View file

13

app/src/main/java/com/fongmi/android/tv/player/exo/ExoRuntimeAwareVideoRenderer.java

View file

22

app/src/main/java/com/fongmi/android/tv/player/exo/ExoUtil.java

View file

39

app/src/main/java/com/fongmi/android/tv/player/exo/PlaybackAnalyticsListener.java

View file

36

app/src/main/java/com/fongmi/android/tv/service/TmdbService.java

View file

304

app/src/main/java/com/fongmi/android/tv/ui/activity/TmdbDetailActivity.java

View file

34

app/src/main/java/com/fongmi/android/tv/ui/helper/TmdbDetailPrefetch.java

View file

38

app/src/main/java/com/fongmi/android/tv/utils/TmdbImageSelector.java

View file

2

app/src/main/res/color/selector_dialog_glass_chip_text.xml

View file

83

app/src/test/java/com/fongmi/android/tv/player/exo/DiagnosticEventFieldAllowlistTest.java

View file

22

app/src/test/java/com/fongmi/android/tv/player/exo/ExoFrameTimingMetricsTest.java

View file

136

app/src/test/java/com/fongmi/android/tv/service/TmdbDisambiguationDetailParityTest.java

View file

19

app/src/test/java/com/fongmi/android/tv/service/TmdbServiceCacheKeyTest.java

View file

68

app/src/test/java/com/fongmi/android/tv/setting/PlaybackPerformanceSettingSourceTest.java

View file

188

app/src/test/java/com/fongmi/android/tv/ui/activity/HomeFragmentCommitStateGuardTest.java

View file

103

app/src/test/java/com/fongmi/android/tv/ui/activity/TmdbDetailDisambiguationPerfSourceTest.java

View file

72

app/src/test/java/com/fongmi/android/tv/ui/activity/TmdbDetailPoolBlockingSourceTest.java

View file

98

app/src/test/java/com/fongmi/android/tv/ui/activity/TmdbDetailPrefetchWiringSourceTest.java

View file

47

app/src/test/java/com/fongmi/android/tv/utils/TmdbImageSelectorTierTest.java

View file

12

app/src/testLeanback/java/com/fongmi/android/tv/ui/activity/TvContentInsetContractTest.java

View file

1

catvod/src/main/java/com/github/catvod/crawler/diagnostics/DiagnosticEvent.java

View file

23

docs/C16-tmdb-source-detail-contract.md

View file

138

docs/C97-beta-merge-review-dev2-20261022.md

View file

90

docs/C97-beta-merge-review-dev3-20261022.md

View file

100

docs/C98-beta-merge-review-dev4-20261022.md

View file

78

docs/C99-beta-merge-review-dev1-20261022.md

View file

115

docs/CRASH-FRAGMENT-STATE-20261022.md

View file

281

docs/E-SP11-exo-tv-frame-drop-defaults.md

View file

230

docs/TMDB-DETAIL-PERF-01-tmdb-detail-load-render.md

View file

10

docs/upstream-player-dependency-merge-assessment-2026-08-20.md

View file