merge: 合并 origin/beta 134bb29dc4 并完成 dev3 未推送代码评审, 主题槽位并集解冲突 + 2 项必修修复

Browse source

Verification: merge origin/beta 134bb29dc4 into dev3; 4 union conflicts resolved in the theme package; 0 unmerged paths; 51 staged paths equal to beta's touched set; no beta path lost and no revert re-landed; review of 3 unpushed dev3 commits plus merged result in 4 rounds; 2 must-fix items fixed with mutation proof; dual-flavour compile BUILD SUCCESSFUL exit 0; theme unit tests 246/246 pass; full-suite failures identical to the origin/beta baseline; git diff --cached --check empty

Task-Guard: C114-beta-merge-review-dev3-20261031

...

This commit is contained in:

Silent1566 2026-10-31 12:31:39 +08:00

parent dccfa6b79b 134bb29dc4

commit a2d4a04faa

54 changed files with 4619 additions and 72 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

47

app/src/androidTest/java/com/fongmi/android/tv/following/FollowingUpdateCoordinatorDeviceTest.java

View file

100

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

View file

6

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

View file

187

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

View file

27

app/src/main/java/com/fongmi/android/tv/App.java

View file

5

app/src/main/java/com/fongmi/android/tv/bean/Backup.java

View file

6

app/src/main/java/com/fongmi/android/tv/bean/Config.java

View file

11

app/src/main/java/com/fongmi/android/tv/bean/Device.java

View file

13

app/src/main/java/com/fongmi/android/tv/bean/History.java

View file

30

app/src/main/java/com/fongmi/android/tv/following/FollowingStore.java

View file

84

app/src/main/java/com/fongmi/android/tv/following/FollowingUpdateCoordinator.java

View file

5

app/src/main/java/com/fongmi/android/tv/following/FollowingUpdateWorker.java

View file

66

app/src/main/java/com/fongmi/android/tv/playback/PlaybackConfigIdentity.java

View file

31

app/src/main/java/com/fongmi/android/tv/playback/PlaybackProgressWriter.java

View file

6

app/src/main/java/com/fongmi/android/tv/player/lyrics/DesktopLyricsWindow.java

View file

20

app/src/main/java/com/fongmi/android/tv/setting/PlaybackPerformanceSetting.java

View file

53

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

View file

17

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

View file

16

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

2

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

View file

7

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

View file

8

app/src/main/java/com/fongmi/android/tv/ui/adapter/FollowingAdapter.java

View file

3

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

View file

3

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

View file

3

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

View file

3

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

View file

37

app/src/test/java/com/fongmi/android/tv/bean/HistoryPlaybackTest.java

View file

78

app/src/test/java/com/fongmi/android/tv/following/FollowingFailureReconcileContractTest.java

View file

75

app/src/test/java/com/fongmi/android/tv/following/FollowingFailureSnapshotContractTest.java

View file

70

app/src/test/java/com/fongmi/android/tv/following/FollowingSeasonProjectionTest.java

View file

97

app/src/test/java/com/fongmi/android/tv/following/FollowingUpdateCoordinatorErrorTest.java

View file

53

app/src/test/java/com/fongmi/android/tv/playback/PlaybackProgressWriterEpisodeTest.java

View file

81

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

View file

98

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

View file

22

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

View file

22

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

View file

36

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

View file

29

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

View file

401

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

View file

3

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

View file

711

docs/C111-leanback-playback-loading-jank.md

View file

277

docs/C112-beta-merge-review-dev2-20261029.md

View file

135

docs/C112-beta-merge-review-dev5-20261030.md

View file

287

docs/C113-beta-merge-review-dev4-20261030.md

View file

199

docs/C114-beta-merge-review-dev3-20261031.md

View file

652

docs/FOLLOW-3-tmdb-following-match-design.md

View file

149

docs/LIVE-LIST-SCRIM-OPACITY-20261029-live-list-scrim.md

View file

204

scripts/perf/leanback_enter_playback_analyze.py

View file

80

scripts/perf/leanback_enter_playback_probe.sh

View file

49

scripts/perf/leanback_enter_rate_probe.sh

View file

67

scripts/perf/set_debug_log.sh

View file