Merge remote-tracking branch 'origin/beta' into dev3

2026-10-25 10:16:33 +00:00 · 2026-10-22 15:14:59 +08:00 · 2026-10-22 15:14:59 +08:00 · 6a36571e51
commit 6a36571e51
parent cae6e4b6e9 3203ca9da0
22 changed files with 913 additions and 17 deletions
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
--- a/app/src/main/java/com/fongmi/android/tv/player/PlaybackOwnershipKeys.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/PlaybackOwnershipKeys.java
--- a/app/src/main/java/com/fongmi/android/tv/player/SurfaceDiagnosticCollector.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/SurfaceDiagnosticCollector.java
--- a/app/src/main/java/com/fongmi/android/tv/service/PlaybackService.java
+++ b/app/src/main/java/com/fongmi/android/tv/service/PlaybackService.java
--- a/app/src/main/java/com/fongmi/android/tv/setting/Setting.java
+++ b/app/src/main/java/com/fongmi/android/tv/setting/Setting.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/activity/PlaybackActivity.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/activity/PlaybackActivity.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/activity/TmdbDetailActivity.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/activity/TmdbDetailActivity.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/activity/VideoSurfaceBinding.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/activity/VideoSurfaceBinding.java
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
--- a/app/src/test/java/com/fongmi/android/tv/player/PlaybackOwnershipKeysTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/player/PlaybackOwnershipKeysTest.java
--- a/app/src/test/java/com/fongmi/android/tv/player/SurfaceRebindDiagnosticTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/player/SurfaceRebindDiagnosticTest.java
--- a/app/src/test/java/com/fongmi/android/tv/setting/FullscreenMenuKeyTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/setting/FullscreenMenuKeyTest.java
--- a/app/src/test/java/com/fongmi/android/tv/ui/activity/PlaybackOwnershipSourceTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/ui/activity/PlaybackOwnershipSourceTest.java
--- a/app/src/test/java/com/fongmi/android/tv/ui/activity/VideoSurfaceBindingTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/ui/activity/VideoSurfaceBindingTest.java
--- a/catvod/src/main/java/com/github/catvod/crawler/diagnostics/DiagnosticEvent.java
+++ b/catvod/src/main/java/com/github/catvod/crawler/diagnostics/DiagnosticEvent.java
--- a/docs/AUTONEXT-02-episode-next-video-surface.md
+++ b/docs/AUTONEXT-02-episode-next-video-surface.md
--- a/docs/C95-beta-merge-review-dev2-20261021.md
+++ b/docs/C95-beta-merge-review-dev2-20261021.md
--- a/docs/C95-beta-merge-review-dev3-20261021.md
+++ b/docs/C95-beta-merge-review-dev3-20261021.md
--- a/docs/C96-beta-merge-review-dev1-20261022.md
+++ b/docs/C96-beta-merge-review-dev1-20261022.md
--- a/docs/upstream-player-dependency-merge-assessment-2026-08-20.md
+++ b/docs/upstream-player-dependency-merge-assessment-2026-08-20.md