Merge pull request #453 from Silent1566/dev4

Browse source

merge: 合并 origin/beta 最新代码（PR#451/#452）并复评修正 4 项守卫脱钩缺陷

...

This commit is contained in:

Silent1566 2026-10-17 09:51:08 +08:00 • committed by GitHub

parent c1f0a5c371 18a43b46f4

commit 323afa1a5a

No known key found for this signature in database

GPG key ID: B5690EEEBB952194

120 changed files with 10192 additions and 185 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

25

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

View file

27

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

View file

27

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

View file

41

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

View file

44

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

View file

64

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

View file

31

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

View file

10

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

View file

10

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

View file

2

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

View file

2

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

View file

12

app/src/leanback/java/com/fongmi/android/tv/ui/presenter/TmdbVideoPresenter.java

View file

10

app/src/leanback/res/color/bg_remark.xml

View file

6

app/src/leanback/res/color/bg_site.xml

View file

6

app/src/leanback/res/color/bg_year.xml

View file

12

app/src/leanback/res/drawable/selector_empty_action.xml

View file

28

app/src/leanback/res/drawable/shape_empty_action_focused.xml

View file

15

app/src/leanback/res/drawable/shape_vod_name.xml

View file

2

app/src/leanback/res/layout/activity_home.xml

View file

98

app/src/leanback/res/layout/activity_setting.xml

View file

2

app/src/leanback/res/layout/adapter_episode_card.xml

View file

2

app/src/leanback/res/layout/adapter_vod.xml

View file

54

app/src/leanback/res/layout/view_empty.xml

View file

7

app/src/leanback/res/layout/view_progress.xml

View file

27

app/src/leanback/res/layout/view_widget_vod.xml

View file

21

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

View file

5

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

View file

29

app/src/main/java/com/fongmi/android/tv/event/StateEvent.java

View file

6

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

View file

39

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

View file

4

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

View file

182

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

View file

3

app/src/main/java/com/fongmi/android/tv/ui/dialog/PanNetworkDiagnosticDialog.java

View file

74

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

View file

15

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

View file

11

app/src/main/res/drawable/selector_dialog_input.xml

View file

31

app/src/main/res/drawable/selector_mpv_tab_focus.xml

View file

30

app/src/main/res/drawable/shape_error_value.xml

View file

19

app/src/main/res/values-night/webhtv_tokens.xml

View file

28

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

View file

28

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

View file

30

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

View file

File diff suppressed because one or more lines are too long

8

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

View file

18

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

View file

103

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

View file

25

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

View file

25

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

View file

19

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

View file

38

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

View file

14

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

View file

41

app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingAdFragment.java

View file

53

app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingEnhanceFragment.java

View file

62

app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java

View file

17

app/src/mobile/res/layout/fragment_vod.xml

View file

4

app/src/mobile/res/layout/item_following.xml

View file

39

app/src/mobile/res/layout/view_empty.xml

View file

7

app/src/mobile/res/layout/view_progress.xml

View file

39

app/src/mobile/res/layout/view_widget_vod.xml

View file

3

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

View file

8

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

View file

10

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

View file

11

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

View file

4

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

View file

120

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

View file

124

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

View file

117

app/src/test/java/com/fongmi/android/tv/ui/adapter/ListStateConvergenceContractTest.java

View file

31

app/src/test/java/com/fongmi/android/tv/ui/style/UiLayoutSourceTest.java

View file

45

app/src/test/java/com/fongmi/android/tv/ui/style/UiStyleSourceTest.java

View file

104

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

View file

211

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

View file

292

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

View file

94

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

View file

187

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

View file

122

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

View file

227

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

View file

215

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

View file

91

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

View file

10

app/src/testMobile/java/com/fongmi/android/tv/ui/activity/HomeCategoryNavigationSourceTest.java

View file

105

app/src/testMobile/java/com/fongmi/android/tv/ui/activity/MobileFollowingCardSemanticContractTest.java

View file

120

app/src/testMobile/java/com/fongmi/android/tv/ui/activity/MobilePlayerErrorRetryContractTest.java

View file

220

app/src/testMobile/java/com/fongmi/android/tv/ui/activity/MobileStateSurfaceContractTest.java

View file

98

app/src/testMobile/java/com/fongmi/android/tv/ui/dialog/DialogInputCornerContractTest.java

View file

178

app/src/testMobile/java/com/fongmi/android/tv/ui/fragment/MobileHomeStateContractTest.java

View file

156

app/src/testMobile/java/com/fongmi/android/tv/ui/fragment/MobileSettingsErrorContractTest.java

View file

9

app/src/testMobile/java/com/fongmi/android/tv/ui/helper/TmdbUIAdapterTest.java

View file

188

docs/C76-beta-merge-review-dev4-20261017.md

View file

142

docs/CONTRAST-P0-20261013.md

View file

127

docs/FILE-BROWSER-EMPTY-20261013.md

View file

114

docs/LIST-STATE-CONVERGENCE-20261013.md

View file

154

docs/MATRIX-B-A9-20261014.md

View file

233

docs/MATRIX-B-M-D-20261013.md

View file

155

docs/MATRIX-B-T-D-20261014.md

View file

309

docs/MATRIX-C-M-20261014.md

View file

231

docs/MATRIX-C-T-20261014.md

View file

456

docs/MATRIX-D-M-20261014.md

View file

399

docs/MATRIX-D-T-20261014.md

View file

315

docs/MATRIX-E-W-20261014.md

View file

131

docs/MOBILE-HISTORY-EMPTY-20261013.md

View file

140

docs/MOBILE-HOME-ERROR-STATE-20261013.md

View file

128

docs/MOBILE-PLAYER-ERROR-RETRY-20261013.md

View file

Some files were not shown because too many files have changed in this diff Show more