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

2026-10-25 10:16:33 +00:00 · 2026-10-21 23:09:49 +08:00 · 2026-10-21 23:09:49 +08:00 · 0c2d6d9ac6
commit 0c2d6d9ac6
parent 30324abe36 590c424568
25 changed files with 796 additions and 82 deletions
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
--- a/app/src/leanback/res/layout/activity_setting.xml
+++ b/app/src/leanback/res/layout/activity_setting.xml
--- a/app/src/leanback/res/layout/view_control_live_action.xml
+++ b/app/src/leanback/res/layout/view_control_live_action.xml
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupManager.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupManager.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupMode.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupMode.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CachePolicyEngine.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CachePolicyEngine.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/dialog/CacheManagementDialog.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/dialog/CacheManagementDialog.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/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/LiveControlDialog.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/LiveControlDialog.java
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java
--- a/app/src/mobile/res/layout/fragment_setting.xml
+++ b/app/src/mobile/res/layout/fragment_setting.xml
--- a/app/src/mobile/res/layout/view_control_live_action.xml
+++ b/app/src/mobile/res/layout/view_control_live_action.xml
--- a/app/src/test/java/com/fongmi/android/tv/cache/CacheFullCleanupTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/cache/CacheFullCleanupTest.java
--- a/app/src/test/java/com/fongmi/android/tv/cache/CachePolicyEngineTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/cache/CachePolicyEngineTest.java
--- a/app/src/testMobile/java/com/fongmi/android/tv/ui/activity/LiveActivityLayoutTest.java
+++ b/app/src/testMobile/java/com/fongmi/android/tv/ui/activity/LiveActivityLayoutTest.java
--- a/docs/C93-beta-merge-review-dev1-20261021.md
+++ b/docs/C93-beta-merge-review-dev1-20261021.md
--- a/docs/C93-beta-merge-review-dev2-20261021.md
+++ b/docs/C93-beta-merge-review-dev2-20261021.md
--- a/docs/C93-upstream-sync-silent1566-cache-row-gesture.md
+++ b/docs/C93-upstream-sync-silent1566-cache-row-gesture.md
--- a/docs/CACHE-MGMT-01-cache-management-design.md
+++ b/docs/CACHE-MGMT-01-cache-management-design.md
--- a/docs/LIVE-UI-01-live-buttons-and-pad-rotate.md
+++ b/docs/LIVE-UI-01-live-buttons-and-pad-rotate.md
--- a/docs/upstream-player-dependency-merge-assessment-2026-08-20.md
+++ b/docs/upstream-player-dependency-merge-assessment-2026-08-20.md