merge+review(C103): 合并 origin/beta 7c725e4d7e 并评审屏显媒体信息徽标 5 个未推送提交（0 冲突、0 必修项）

Browse source

Verification: mobile:testMobileArm64_v8aDebugUnitTest MediaBadgeResolverTest+PlayerDisplaySettingSyncTest+ControlDialogOsdSettingsTest+DroppedFrameAccountingTest+ExoDecoderRuntimeSessionTest 全绿(4m38s)；mobile 补充 ThemeEditorContractTest(12)+PlaybackMenuScrimTest(5)+ThemeProfileCodecTest(8)+ThemeProfileValidatorTest(9)+UpdateVersionRowThemeTest(10)+SettingPlaybackOverlayTest(3)+PythonSpiderDiagnosticsWiringTest(2) 全绿；leanback:testLeanbackArm64_v8aDebugUnitTest MediaBadgeResolverTest(24)+ThemeEditorPanelTest(2)+TvFilterResetLongPressTest(4) 全绿；合并 0 冲突、54 路径中 50 个 blob 与 origin/beta 逐字节一致、4 个自动合并文件逐行复核；git diff --cached --check 通过

Task-Guard: C103-BETA-MERGE-DEV1-OSD-20261024

...

This commit is contained in:

Silent1566 2026-10-24 14:49:02 +08:00

parent 64ee84e68e 7c725e4d7e

commit 1322505938

55 changed files with 2980 additions and 36 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

6

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

View file

4

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

View file

4

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

View file

8

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

View file

3

app/src/leanback/java/com/fongmi/android/tv/ui/adapter/TypeAdapter.java

View file

71

app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomTypeView.java

View file

18

app/src/leanback/java/com/fongmi/android/tv/ui/dialog/UpdateDialog.java

View file

5

app/src/leanback/java/com/fongmi/android/tv/ui/fragment/FolderFragment.java

View file

23

app/src/leanback/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java

View file

1

app/src/leanback/res/values-zh-rCN/strings.xml

View file

1

app/src/leanback/res/values-zh-rTW/strings.xml

View file

1

app/src/leanback/res/values/strings.xml

View file

6

app/src/main/java/com/fongmi/android/tv/player/engine/ExoPlayerEngine.java

View file

108

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

View file

36

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

View file

59

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

View file

54

app/src/main/java/com/fongmi/android/tv/theme/PlaybackMenuScrim.java

View file

17

app/src/main/java/com/fongmi/android/tv/theme/ThemeController.java

View file

9

app/src/main/java/com/fongmi/android/tv/theme/ThemeEditor.java

View file

7

app/src/main/java/com/fongmi/android/tv/theme/ThemePreviewView.java

View file

10

app/src/main/java/com/fongmi/android/tv/theme/ThemeProfile.java

View file

3

app/src/main/java/com/fongmi/android/tv/theme/ThemeProfileValidator.java

View file

279

app/src/main/java/com/fongmi/android/tv/theme/UpdateVersionRowTheme.java

View file

44

app/src/main/java/com/fongmi/android/tv/ui/custom/PlayerOsdController.java

View file

1

app/src/main/res/values-zh-rCN/strings.xml

View file

1

app/src/main/res/values-zh-rTW/strings.xml

View file

1

app/src/main/res/values/strings.xml

View file

4

app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java

View file

4

app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java

View file

25

app/src/mobile/java/com/fongmi/android/tv/ui/dialog/UpdateDialog.java

View file

111

app/src/test/java/com/fongmi/android/tv/api/loader/PythonSpiderDiagnosticsWiringTest.java

View file

103

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

View file

63

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

View file

6

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

View file

62

app/src/test/java/com/fongmi/android/tv/theme/PlaybackMenuScrimTest.java

View file

5

app/src/test/java/com/fongmi/android/tv/theme/ThemeEditorContractTest.java

View file

11

app/src/test/java/com/fongmi/android/tv/theme/ThemeProfileCodecTest.java

View file

15

app/src/test/java/com/fongmi/android/tv/theme/ThemeProfileValidatorTest.java

View file

240

app/src/test/java/com/fongmi/android/tv/theme/UpdateVersionRowThemeTest.java

View file

3

app/src/testLeanback/java/com/fongmi/android/tv/theme/ThemeEditorPanelTest.java

View file

133

app/src/testLeanback/java/com/fongmi/android/tv/ui/custom/TvFilterResetLongPressTest.java

View file

26

chaquo/src/main/java/com/fongmi/chaquo/Spider.java

View file

50

chaquo/src/main/python/app.py

View file

162

chaquo/src/test/python/test_app_bridge_contract.py

View file

142

docs/C100-beta-merge-review-dev3-20261023.md

View file

157

docs/C101-beta-merge-review-dev4-20261023.md

View file

209

docs/C102-beta-merge-review-dev3-20261023.md

View file

91

docs/C103-beta-merge-review-dev1-20261024.md

View file

250

docs/E-SP12-exo-pause-settled-dropped-frames.md

View file

257

docs/PY-BRIDGE-DEPEND-01-py-bridge-download-contract.md

View file

15

docs/THEME-CUSTOMIZATION-LAYERS-20260921.md

View file

83

docs/TV-FILTER-RESET-01-category-long-press-reset-20261023.md

View file

4

docs/integration/extensions.md

View file

4

docs/integration/spider.md

View file

1

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

View file