merge+review(C102): 合并 origin/beta d9da14dcb7 到 dev3，修复版本卡片焦点与选中线索退化

Browse source

Verification: 合并 origin/beta d9da14dcb7 到 dev3（11 提交/30 路径/+1036-27，merge-tree 冲突预检 rc=0，正反向路径集核对一致）；评审 7067d62b7b 并修复 F1（版本卡片聚焦与选中填充退化为同一色、描边硬编码绕开 webhtv_focus_ring_width，守卫用例只读 XML 已对运行时失效）；修复后定向单测双 flavour 1+3 类/51 例全绿、合并后主题+对话框回归双 flavour 93 类/601 例 0 失败 0 错误；负向对照（回退 focusFill）theFocusedCardStaysDistinguishableFromTheSelectedCard FAILED/1 failed 证明用例有效并已逐字节还原；check_ui_tokens.py UI_TOKEN_STATUS PASS；git diff --check 与 --cached --check 为空、无冲突标记

Task-Guard: C102-beta-merge-review-dev3-20261023

...

This commit is contained in:

Silent1566 2026-10-24 02:22:42 +08:00

parent 7067d62b7b d9da14dcb7

commit db553538b2

33 changed files with 1373 additions and 38 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

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

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

93

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

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

55

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

157

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

View file

200

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

View file

250

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

View file

15

docs/THEME-CUSTOMIZATION-LAYERS-20260921.md

View file

1

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

View file