From 840bc42713e5ca5879e3f81f80eefe918079ae1f Mon Sep 17 00:00:00 2001 From: qianyong325 Date: Wed, 21 May 2025 09:37:00 +0800 Subject: [PATCH 01/42] =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E9=94=AE=E7=9B=98?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=96=B0=E5=A2=9E=E9=98=BF=E6=8B=89=E4=BC=AF?= =?UTF-8?q?=E8=AF=AD=E5=8F=8A=E4=BF=84=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qianyong325 --- systemres/main/resources/ru/element/string.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/systemres/main/resources/ru/element/string.json b/systemres/main/resources/ru/element/string.json index 9bf2635b..ef771045 100644 --- a/systemres/main/resources/ru/element/string.json +++ b/systemres/main/resources/ru/element/string.json @@ -328,6 +328,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"ohos_id_input_method_settings", + "value":"Еще", + "attr":{ + "priority":"translate" + } } ] } -- Gitee From dec3ee50225e64e95f15a30a0588cee9e83600ff Mon Sep 17 00:00:00 2001 From: zhanghang Date: Wed, 21 May 2025 14:48:00 +0800 Subject: [PATCH 02/42] =?UTF-8?q?feat=EF=BC=9Aadd=20refresh=20scrollable?= =?UTF-8?q?=20over=20follow=20ratio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanghang --- systemres/main/resources/wearable/element/float.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/systemres/main/resources/wearable/element/float.json b/systemres/main/resources/wearable/element/float.json index ed9c34f7..19060c33 100644 --- a/systemres/main/resources/wearable/element/float.json +++ b/systemres/main/resources/wearable/element/float.json @@ -403,6 +403,14 @@ { "name": "padding_level8", "value": "10.0vp" + }, + { + "name": "scroll_able_over_edge_following_ratio_api_twenty", + "value": "10.0" + }, + { + "name": "refresh_over_edge_following_ratio_api_twenty", + "value": "10.0" } ] } -- Gitee From af7164dc4bdb592456cc8df853cdb0b5de4de441 Mon Sep 17 00:00:00 2001 From: qianyong325 Date: Wed, 21 May 2025 09:37:00 +0800 Subject: [PATCH 03/42] =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E9=94=AE=E7=9B=98?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=96=B0=E5=A2=9E=E9=98=BF=E6=8B=89=E4=BC=AF?= =?UTF-8?q?=E8=AF=AD=E5=8F=8A=E4=BF=84=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qianyong325 --- systemres/main/resources/ar/element/string.json | 7 +++++++ systemres/main/resources/ru/element/string.json | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/systemres/main/resources/ar/element/string.json b/systemres/main/resources/ar/element/string.json index 402bf001..29e2469a 100644 --- a/systemres/main/resources/ar/element/string.json +++ b/systemres/main/resources/ar/element/string.json @@ -328,6 +328,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"ohos_id_input_method_settings", + "value":"المزيد", + "attr":{ + "priority":"translate" + } } ] } diff --git a/systemres/main/resources/ru/element/string.json b/systemres/main/resources/ru/element/string.json index 9bf2635b..ef771045 100644 --- a/systemres/main/resources/ru/element/string.json +++ b/systemres/main/resources/ru/element/string.json @@ -328,6 +328,13 @@ "attr":{ "priority":"translate" } + }, + { + "name":"ohos_id_input_method_settings", + "value":"Еще", + "attr":{ + "priority":"translate" + } } ] } -- Gitee From c245bb16e55ee28d2f63add5e789b059663b96e7 Mon Sep 17 00:00:00 2001 From: zhanghang Date: Wed, 21 May 2025 15:49:09 +0800 Subject: [PATCH 04/42] Add select check mark color. Signed-off-by: zhanghang --- systemres/main/resources/base/element/float.json | 4 ++++ .../main/resources/base/element/id_defined.json | 5 +++++ systemres/main/resources/base/element/pattern.json | 12 ++++++++++++ 3 files changed, 21 insertions(+) diff --git a/systemres/main/resources/base/element/float.json b/systemres/main/resources/base/element/float.json index e591438e..b3b7d872 100644 --- a/systemres/main/resources/base/element/float.json +++ b/systemres/main/resources/base/element/float.json @@ -4063,6 +4063,10 @@ { "name": "ai_intelligent_gradient_scalar4", "value": "1.0" + }, + { + "name": "select_check_mark_font_weight", + "value": "14.0" } ] } diff --git a/systemres/main/resources/base/element/id_defined.json b/systemres/main/resources/base/element/id_defined.json index 78e379a2..9778699a 100644 --- a/systemres/main/resources/base/element/id_defined.json +++ b/systemres/main/resources/base/element/id_defined.json @@ -32895,6 +32895,11 @@ "type": "float", "name": "segmentbutton_container_shape", "order": 6534 + }, + { + "type": "float", + "name": "select_check_mark_font_weight", + "order": 6535 } ] } diff --git a/systemres/main/resources/base/element/pattern.json b/systemres/main/resources/base/element/pattern.json index c313cb5d..20f9463c 100644 --- a/systemres/main/resources/base/element/pattern.json +++ b/systemres/main/resources/base/element/pattern.json @@ -6338,6 +6338,18 @@ "name": "select_symbol_color", "value": "$color:select_font_color" }, + { + "name": "select_check_mark_color", + "value": "$color:icon_primary" + }, + { + "name": "select_check_mark_font_weight", + "value": "$float:select_check_mark_font_weight" + }, + { + "name": "select_check_mark_font_size", + "value": "24.0vp" + }, { "name": "focus_bg_outline_color", "value": "$color:ohos_id_color_activated" -- Gitee From 9db276dd37444eb605dc5f6e8d5c78316b37b580 Mon Sep 17 00:00:00 2001 From: kangpeng Date: Mon, 26 May 2025 14:40:36 +0800 Subject: [PATCH 05/42] =?UTF-8?q?[menu]=E5=91=BD=E4=BB=A4=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: kangpeng --- systemres/main/resources/base/element/float_sys.json | 2 +- systemres/main/resources/base/element/id_defined.json | 2 +- systemres/main/resources/base/element/pattern.json | 4 ++-- systemres/main/resources/tv/element/pattern.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/systemres/main/resources/base/element/float_sys.json b/systemres/main/resources/base/element/float_sys.json index 1a9fe5a0..31c262bc 100644 --- a/systemres/main/resources/base/element/float_sys.json +++ b/systemres/main/resources/base/element/float_sys.json @@ -657,7 +657,7 @@ "value": "6.0" }, { - "name": "menu_need_focus", + "name": "menu_item_need_focus", "value": "0" }, { diff --git a/systemres/main/resources/base/element/id_defined.json b/systemres/main/resources/base/element/id_defined.json index 78e379a2..9d8f37d7 100644 --- a/systemres/main/resources/base/element/id_defined.json +++ b/systemres/main/resources/base/element/id_defined.json @@ -26858,7 +26858,7 @@ }, { "type": "float", - "name": "menu_need_focus", + "name": "menu_item_need_focus", "order": 5335 }, { diff --git a/systemres/main/resources/base/element/pattern.json b/systemres/main/resources/base/element/pattern.json index c313cb5d..5a41aba1 100644 --- a/systemres/main/resources/base/element/pattern.json +++ b/systemres/main/resources/base/element/pattern.json @@ -6691,8 +6691,8 @@ "value": "$string:menu_focus_directional_key_enable_default" }, { - "name": "menu_need_focus", - "value": "$float:menu_need_focus" + "name": "menu_item_need_focus", + "value": "$float:menu_item_need_focus" }, { "name": "menu_default_show_divider", diff --git a/systemres/main/resources/tv/element/pattern.json b/systemres/main/resources/tv/element/pattern.json index 7108fee2..a7661b8f 100644 --- a/systemres/main/resources/tv/element/pattern.json +++ b/systemres/main/resources/tv/element/pattern.json @@ -2830,7 +2830,7 @@ "value": "$float:menu_background_blur_style" }, { - "name": "menu_need_focus", + "name": "menu_item_need_focus", "value": "1" }, { -- Gitee From 3849010f645388bf80f4dd5b384da9a715751196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B0=B8=E5=87=AF?= Date: Sat, 24 May 2025 16:47:58 +0800 Subject: [PATCH 06/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘永凯 --- .../resources/base/element/id_defined.json | 33 ++++++++++----- .../main/resources/base/element/pattern.json | 21 ---------- .../main/resources/base/element/string.json | 40 ------------------- .../main/resources/base/element/theme.json | 4 -- .../main/resources/zh_CN/element/string.json | 40 ------------------- .../main/resources/zh_HK/element/string.json | 2 +- 6 files changed, 23 insertions(+), 117 deletions(-) diff --git a/systemres/main/resources/base/element/id_defined.json b/systemres/main/resources/base/element/id_defined.json index 78e379a2..30758adb 100644 --- a/systemres/main/resources/base/element/id_defined.json +++ b/systemres/main/resources/base/element/id_defined.json @@ -24312,7 +24312,8 @@ { "type": "string", "name": "general_refresh", - "order": 4826 + "order": 4826, + "flags": "private" }, { "type": "string", @@ -24367,22 +24368,26 @@ { "type": "string", "name": "general_maximized_display", - "order": 4837 + "order": 4837, + "flags": "private" }, { "type": "string", "name": "general_exit_maximized_display", - "order": 4838 + "order": 4838, + "flags": "private" }, { "type": "string", "name": "general_full_screen_display", - "order": 4839 + "order": 4839, + "flags": "private" }, { "type": "string", "name": "general_exit_full_screen_display", - "order": 4840 + "order": 4840, + "flags": "private" }, { "type": "string", @@ -24397,7 +24402,8 @@ { "type": "string", "name": "general_text_clock_week", - "order": 4843 + "order": 4843, + "flags": "private" }, { "type": "string", @@ -24407,22 +24413,26 @@ { "type": "string", "name": "general_calendar_week", - "order": 4845 + "order": 4845, + "flags": "private" }, { "type": "string", "name": "general_year", - "order": 4846 + "order": 4846, + "flags": "private" }, { "type": "string", "name": "general_month", - "order": 4847 + "order": 4847, + "flags": "private" }, { "type": "string", "name": "general_day", - "order": 4848 + "order": 4848, + "flags": "private" }, { "type": "string", @@ -32714,7 +32724,8 @@ { "type": "pattern", "name": "ohos_text_clock_pattern", - "order": 6498 + "order": 6498, + "flags": "private" }, { "type": "float", diff --git a/systemres/main/resources/base/element/pattern.json b/systemres/main/resources/base/element/pattern.json index c313cb5d..b07042a2 100644 --- a/systemres/main/resources/base/element/pattern.json +++ b/systemres/main/resources/base/element/pattern.json @@ -9509,27 +9509,6 @@ "value": "$float:app_theme_drag_pan_distance_mouse" } ] - }, - { - "name": "ohos_text_clock_pattern", - "value": [ - { - "name": "general_text_clock_week", - "value": "$string:general_text_clock_week" - }, - { - "name": "general_year", - "value": "$string:general_year" - }, - { - "name": "general_month", - "value": "$string:general_month" - }, - { - "name": "general_day", - "value": "$string:general_day" - } - ] } ] } diff --git a/systemres/main/resources/base/element/string.json b/systemres/main/resources/base/element/string.json index 5db2156d..011ed247 100644 --- a/systemres/main/resources/base/element/string.json +++ b/systemres/main/resources/base/element/string.json @@ -1019,10 +1019,6 @@ "priority": "translate" } }, - { - "name": "general_refresh", - "value": "Refreshing…" - }, { "name": "general_copy", "value": "Copy", @@ -1090,22 +1086,6 @@ "priority": "translate" } }, - { - "name": "general_maximized_display", - "value": "Maximize" - }, - { - "name": "general_exit_maximized_display", - "value": "Exit Maximize" - }, - { - "name": "general_full_screen_display", - "value": "Full Screen" - }, - { - "name": "general_exit_full_screen_display", - "value": "Exit Full Screen" - }, { "name": "general_window_left_screen", "value": "Show on left" @@ -1117,10 +1097,6 @@ "priority": "translate" } }, - { - "name": "general_text_clock_week", - "value": "week" - }, { "name": "general_display_lunar_calendar", "value": "Show lunar calendar", @@ -1128,22 +1104,6 @@ "priority": "translate" } }, - { - "name": "general_calendar_week", - "value": "week" - }, - { - "name": "general_year", - "value": "year" - }, - { - "name": "general_month", - "value": "month" - }, - { - "name": "general_day", - "value": "day" - }, { "name":"general_pre_month", "value":"Previous month", diff --git a/systemres/main/resources/base/element/theme.json b/systemres/main/resources/base/element/theme.json index f609e554..d9abc21d 100644 --- a/systemres/main/resources/base/element/theme.json +++ b/systemres/main/resources/base/element/theme.json @@ -267,10 +267,6 @@ "name": "app_theme_pattern", "value": "$pattern:ohos_app_theme_pattern" }, - { - "name": "text_clock_pattern", - "value": "$pattern:ohos_text_clock_pattern" - }, { "name":"security_component_pattern", "value":"$pattern:ohos_security_component_pattern" diff --git a/systemres/main/resources/zh_CN/element/string.json b/systemres/main/resources/zh_CN/element/string.json index d1520809..6906f362 100644 --- a/systemres/main/resources/zh_CN/element/string.json +++ b/systemres/main/resources/zh_CN/element/string.json @@ -899,10 +899,6 @@ "priority": "translate" } }, - { - "name": "general_refresh", - "value": "正在刷新…" - }, { "name": "general_copy", "value": "复制", @@ -970,22 +966,6 @@ "priority": "translate" } }, - { - "name": "general_maximized_display", - "value": "最大化显示" - }, - { - "name": "general_exit_maximized_display", - "value": "退出最大化显示" - }, - { - "name": "general_full_screen_display", - "value": "全屏显示" - }, - { - "name": "general_exit_full_screen_display", - "value": "退出全屏显示" - }, { "name": "general_window_left_screen", "value": "窗口显示在屏幕左侧" @@ -997,10 +977,6 @@ "priority": "translate" } }, - { - "name": "general_text_clock_week", - "value": "周" - }, { "name": "general_display_lunar_calendar", "value": "显示农历", @@ -1008,22 +984,6 @@ "priority": "translate" } }, - { - "name": "general_calendar_week", - "value": "星期" - }, - { - "name": "general_year", - "value": "年" - }, - { - "name": "general_month", - "value": "月" - }, - { - "name": "general_day", - "value": "日" - }, { "name":"general_pre_month", "value":"上一月", diff --git a/systemres/main/resources/zh_HK/element/string.json b/systemres/main/resources/zh_HK/element/string.json index 8ca77d3a..60aa9e04 100644 --- a/systemres/main/resources/zh_HK/element/string.json +++ b/systemres/main/resources/zh_HK/element/string.json @@ -520,7 +520,7 @@ }, { "name": "textfield_has_showed_password", - "value": "密碼已顯示 " + "value": "密碼已顯示" }, { "name": "textfield_has_hidden_password", -- Gitee From 293784e41e3fc4bcdedd7793468fbedb01cf8c68 Mon Sep 17 00:00:00 2001 From: dingjidong Date: Wed, 28 May 2025 10:59:06 +0800 Subject: [PATCH 07/42] =?UTF-8?q?=E3=80=90dialog=E3=80=91=E5=B1=8F?= =?UTF-8?q?=E5=B9=95=E6=9C=97=E8=AF=BB=E6=96=87=E6=9C=AC=E9=80=82=E9=85=8D?= =?UTF-8?q?PC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: dingjidong --- systemres/main/resources/2in1/element/string.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/systemres/main/resources/2in1/element/string.json b/systemres/main/resources/2in1/element/string.json index c0735025..67079ffc 100644 --- a/systemres/main/resources/2in1/element/string.json +++ b/systemres/main/resources/2in1/element/string.json @@ -67,6 +67,10 @@ { "name": "treeview_accessibility_node_desc", "value": "Double click to select, double click and hold, then drag to change order" + }, + { + "name": "advanced_dialog_accessibility_cancel_checked_desc", + "value": "Double-click to deselect" } ] } -- Gitee From 85dd43a5fe2d1393f295e539d2f5e6bd5c0206ed Mon Sep 17 00:00:00 2001 From: "@ran-zhao-yu" Date: Wed, 28 May 2025 11:30:35 +0800 Subject: [PATCH 08/42] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsymbol=E5=AD=97?= =?UTF-8?q?=E4=BD=93yMax=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: @ran-zhao-yu --- fonts/HMSymbolVF.ttf | Bin 3183928 -> 3183928 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/fonts/HMSymbolVF.ttf b/fonts/HMSymbolVF.ttf index 5c6fe8c003d1250cbf6b437c99b30a7707b09ce6..06664fbf5f8f097783ae403ed5e61602814ed123 100644 GIT binary patch delta 207 zcmWl~%QAv-06_8bFPB_GDRL=%R4(NKEIfgg7KRy*kXLAN20O3NbXNA!SlZb25XORC z8(aCDnctkj(_3;7d+df$=e#2(aRLLTFpZNqh0{2L8JxvAoW}*s;vz2LGUhOkD_FoH zuHqV&a2+>r6SuI872L)h+{Fm@a38B!!#W<|As*pz-^TSt^zi)MyUCvZBtrN~#C^QB d3;+MT9A1sz$M@;qaC;ZE8nNa})H=zZ{Q>yNRj~j7 delta 207 zcmWl~txiG#06<~zf+GH)h$xDncop#neE}Dq$ zFJKj}XZv0rf~_EaRpZ~gKM~sS=_)JZekv{ za2pG_gS%M7JuG1v_wfKLc!(h$;W1Y61Z#MTXLybmuhwsyVdv(hcbB>TjRnCZ7WMu1 dkpKTr_G>)-m_8-{D)*0Js~))=hOMhyV+JJERj~j7 -- Gitee From 3302928dc6264bb7636d03506260890daa1aee44 Mon Sep 17 00:00:00 2001 From: wangweiyuan Date: Wed, 28 May 2025 14:23:58 +0800 Subject: [PATCH 09/42] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85=E8=AF=AD?= =?UTF-8?q?=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangweiyuan --- systemres/main/resources/bo_CN/element/string.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/systemres/main/resources/bo_CN/element/string.json b/systemres/main/resources/bo_CN/element/string.json index dac02057..43b7547c 100644 --- a/systemres/main/resources/bo_CN/element/string.json +++ b/systemres/main/resources/bo_CN/element/string.json @@ -481,6 +481,13 @@ "priority": "translate" } }, + { + "name": "text_overlay_menu_more_accessibility_text", + "value": "དེ་ལས་མང་བ།", + "attr": { + "priority": "translate" + } + }, { "name": "stepper_back", "value": "ཕྱིར་ལོག", @@ -488,6 +495,13 @@ "priority": "translate" } }, + { + "name": "text_overlay_menu_back_accessibility_text", + "value": "ཕྱིར་ལོག", + "attr": { + "priority": "translate" + } + }, { "name": "stepper_next", "value": "གོམ་རིམ་ཕྱི་མ།", -- Gitee From 7a9429f913092f95f4b2500dfd9a57b33b231900 Mon Sep 17 00:00:00 2001 From: liuleimin_hw Date: Fri, 30 May 2025 02:23:13 +0000 Subject: [PATCH 10/42] update systemres/main/module.json. Signed-off-by: liuleimin_hw --- systemres/main/module.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/systemres/main/module.json b/systemres/main/module.json index 87048cd9..edab0632 100644 --- a/systemres/main/module.json +++ b/systemres/main/module.json @@ -1990,6 +1990,15 @@ "provisionEnable": true, "distributedSceneEnable": false }, + { + "name": "ohos.permission.LINKTURBO", + "grantMode": "system_grant", + "availableLevel": "system_basic", + "since": 20, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false + }, { "name": "ohos.permission.PERMISSION_USED_STATS", "grantMode": "system_grant", -- Gitee From e9963f44c2d58a8225c55d3c64062e5041a6ffa8 Mon Sep 17 00:00:00 2001 From: lijuan124 Date: Wed, 28 May 2025 14:47:44 +0800 Subject: [PATCH 11/42] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lijuan124 --- .../resources/base/element/id_defined.json | 30 +++++++++++++++++ .../main/resources/base/element/pattern.json | 32 +++++++++++++++++++ .../main/resources/base/element/string.json | 20 ++++++++++++ .../resources/base/media/ic_person_fill.svg | 9 ++++++ .../resources/dark/media/ic_person_fill.svg | 1 + .../main/resources/zh_CN/element/string.json | 20 ++++++++++++ 6 files changed, 112 insertions(+) create mode 100644 systemres/main/resources/base/media/ic_person_fill.svg create mode 100644 systemres/main/resources/dark/media/ic_person_fill.svg diff --git a/systemres/main/resources/base/element/id_defined.json b/systemres/main/resources/base/element/id_defined.json index 1ebf6128..fa8b713a 100644 --- a/systemres/main/resources/base/element/id_defined.json +++ b/systemres/main/resources/base/element/id_defined.json @@ -32911,6 +32911,36 @@ "type": "float", "name": "select_check_mark_font_weight", "order": 6535 + }, + { + "type": "string", + "name": "general_ai_preview_menu_address_open_map_app", + "order": 6536 + }, + { + "type": "string", + "name": "general_ai_preview_menu_url_open_browser_app", + "order": 6537 + }, + { + "type": "string", + "name": "general_ai_preview_menu_date_install_calendar_app", + "order": 6538 + }, + { + "type": "string", + "name": "general_ai_preview_menu_address_install_map_app", + "order": 6539 + }, + { + "type": "string", + "name": "general_ai_preview_menu_display_failed", + "order": 6540 + }, + { + "type": "media", + "name": "ic_person_fill", + "order": 6541 } ] } diff --git a/systemres/main/resources/base/element/pattern.json b/systemres/main/resources/base/element/pattern.json index 93d80b36..0cd2a320 100644 --- a/systemres/main/resources/base/element/pattern.json +++ b/systemres/main/resources/base/element/pattern.json @@ -5849,6 +5849,34 @@ { "name": "ai_intelligent_gradient_scalar4", "value": "$float:ai_intelligent_gradient_scalar4" + }, + { + "name": "general_ai_preview_menu_address_open_map_app", + "value": "$string:general_ai_preview_menu_address_open_map_app" + }, + { + "name": "general_ai_preview_menu_url_open_browser_app", + "value": "$string:general_ai_preview_menu_url_open_browser_app" + }, + { + "name": "general_ai_preview_menu_date_install_calendar_app", + "value": "$string:general_ai_preview_menu_date_install_calendar_app" + }, + { + "name": "general_ai_preview_menu_address_install_map_app", + "value": "$string:general_ai_preview_menu_address_install_map_app" + }, + { + "name": "general_ai_preview_menu_display_failed", + "value": "$string:general_ai_preview_menu_display_failed" + }, + { + "name": "general_ai_preview_menu_display_failed_font_size", + "value": "$float:Body_M" + }, + { + "name": "general_ai_preview_menu_display_failed_font_color", + "value": "$color:font_secondary" } ] }, @@ -7477,6 +7505,10 @@ { "name": "ic_time_limit_picture", "value": "$media:ic_time_limit_picture" + }, + { + "name": "ic_person_fill", + "value": "$media:ic_person_fill" } ] }, diff --git a/systemres/main/resources/base/element/string.json b/systemres/main/resources/base/element/string.json index 011ed247..2f1c8b76 100644 --- a/systemres/main/resources/base/element/string.json +++ b/systemres/main/resources/base/element/string.json @@ -2069,6 +2069,26 @@ { "name": "menu_animation_curve", "value": "fast_out_slow_in" + }, + { + "name": "general_ai_preview_menu_address_open_map_app", + "value": "Use the Petal Map to navigate" + }, + { + "name": "general_ai_preview_menu_url_open_browser_app", + "value": "Use Huawei Browser to open it" + }, + { + "name": "general_ai_preview_menu_date_install_calendar_app", + "value": "Click to install the Calendar app" + }, + { + "name": "general_ai_preview_menu_address_install_map_app", + "value": "Click to install the Petal Map app" + }, + { + "name": "general_ai_preview_menu_display_failed", + "value": "Preview display failed" } ] } diff --git a/systemres/main/resources/base/media/ic_person_fill.svg b/systemres/main/resources/base/media/ic_person_fill.svg new file mode 100644 index 00000000..b471ff22 --- /dev/null +++ b/systemres/main/resources/base/media/ic_person_fill.svg @@ -0,0 +1,9 @@ + + + Created with Pixso. + + + + + + diff --git a/systemres/main/resources/dark/media/ic_person_fill.svg b/systemres/main/resources/dark/media/ic_person_fill.svg new file mode 100644 index 00000000..d329f641 --- /dev/null +++ b/systemres/main/resources/dark/media/ic_person_fill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/systemres/main/resources/zh_CN/element/string.json b/systemres/main/resources/zh_CN/element/string.json index 6906f362..a991e38b 100644 --- a/systemres/main/resources/zh_CN/element/string.json +++ b/systemres/main/resources/zh_CN/element/string.json @@ -1927,6 +1927,26 @@ { "name": "general_ai_menu_url", "value": "打开链接" + }, + { + "name": "general_ai_preview_menu_address_open_map_app", + "value": "使用“花瓣地图”导航" + }, + { + "name": "general_ai_preview_menu_url_open_browser_app", + "value": "使用“华为浏览器”打开" + }, + { + "name": "general_ai_preview_menu_date_install_calendar_app", + "value": "点击安装“日历”App" + }, + { + "name": "general_ai_preview_menu_address_install_map_app", + "value": "点击安装“花瓣地图”App" + }, + { + "name": "general_ai_preview_menu_display_failed", + "value": "预览显示失败" } ] } -- Gitee From ceee41728ca99e68102be2bdb1d6f1b26dab4927 Mon Sep 17 00:00:00 2001 From: chenli <443494770@qq.com> Date: Fri, 30 May 2025 16:44:24 +0800 Subject: [PATCH 12/42] =?UTF-8?q?symbol=E8=B5=84=E6=BA=90=E5=90=88?= =?UTF-8?q?=E5=85=A5=20Signed-off-by:=20wanggang=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fonts/HMSymbolVF_watch.ttf | Bin 2088612 -> 2089064 bytes fonts/hm_symbol_config_next_watch.json | 3952 +++++++++++++----------- 2 files changed, 2088 insertions(+), 1864 deletions(-) diff --git a/fonts/HMSymbolVF_watch.ttf b/fonts/HMSymbolVF_watch.ttf index 592e6839ed4decafd164c134b96c2b54100768cc..c47f8f014d5214598cdb5db458ea82e239c5b3a3 100644 GIT binary patch delta 10853 zcmW-n4}4D5AICqN*>mqb=l+|SVYW5HFbu=eXjqI^mX;RscNmREi>2im7E98|pJ8cf zY5CWRY$7eGRxOsKVLy#Vi^XWo((wB{&tAQKzW3bo{d3Me_j&GfZiSya>&l$D3C@^n z9=`#esX+VcS&ODE%$>h@9uN=*VCn4Cmu7|fZo0+ea>!+svw42d?Akq$+w)+5zdU8; zwB%kByZa$`Bx%uCN`H)>389%ley$5Wr5F)j9^-MI){9}V;< zoi{Dxu{1Hna}ffMG}0k>{`{1-y2oJ^w=bm{&LR`4Ci^k(Gh0r3vS>DrPh#( zZ0|y?C6{S;qy9;*(e6&YL2l9xr#8BQqYt&o4IB~FW;by3rQUG^M?dOaa-Y8aVLH7n zm;{c2)UKo(?LkzYByc=P9pVO#!PJLIEZZNVjwBOl52H?Y1IN?Usbo6alc>pV;Fw6A z?FNoX)H!4>oNzo#Bh?KYQ>f3ofx{JK0a?gE)2Qig;Fv*O;sy>^@K@ZxF_Y>fS?oWH zy4(#MDb!cpz~M@|$_*TIsjs;lR@31*>KZq2%%iR)Z?b(pbsgD2JB_;84IHjwwzz@g zMd~&;a4e#}O}4ZDV(PnY;CP9;(+wQ1;)~qC;e46KZZ~jbQun%n!!@dp-N3Pw`l%Z_ zP)pswkwyL74IIm;Uyw2;c8&aNH*jQAzjXtLYZksEC)sBu^%vLm|Ahx{@ZeWBaJWW( z4kp(C9B)#2{duk7_>20m8#o%M!-;Dh+@y|j0|ytPV+@IB`#;q2B#AZ`qU)LyIR2w@ ztq?d`;51#=mcVhB%4_SGP5T~|>wr@Zr4@A{NvGYK$|>g5LQ$xkN&-cra+U}bLFH^X zR?wDIUT?>1v`s26F$W99hw2*Kn@%41(%3)_(QZpU>;}q1R8FshH?tB={oW0fIO>n& z1lvbbE6Go^AEo~62FhbpPA`G-IF+;OI7@ph^*2&OdmPnyiT_;TK_a!z4U}i7^=_a{ zpx$r;Wg^uz-FMla)2Von*0i~*6_xNdR=8l5Hl!VG&Xm%gbfEn*HIM|;=Gsz1NKe42 za1klJNN=84O^qP^XmhHRNHj3lsb>sU)joogFJYf6wu};p0dLY6wZiJ=myH4RNg|$hwO8e%DYB6 zLi;-Ps2ixDmXR+3)ipa`kt*6;Lkbr)V?%Y#$Q3tGL!C5SNg8;f3-uPcO}jVsKQ~Za zv%m$Z@FP4cTq~+h4BDI>)h4_I>M$x3s-0+a-KarspmKevyacMV zJ5O+dsNrs)j;Hn|QEY#jI+*b5NS#6*N`}*(PK_nJ&D7b{1o9N^G^)#oAHC`#>RiI9 zR+m%XAX{kj^FaNG6w_YE`(G{LK?x7uqJHKE>IN#OltA4`<&>(&X!Clj$4Mn^UT^i3 z8>qZ2>RED*?H^EU2^Y2cA@!OYsC%fqR0Qf?Y7@DQj!^f}_}2|sm8o*73Dl3@%JJXk z`~;?8cu~X_E*ZhAPN4ELP;i-v{j?8JISj!YSUo~LOunG~1(oHBuW7sVJ2z0jp;nL+ zZ2y+}6FEhjH@NtP@J3Z#=g)I~#2-9xb>Q+7{2Es;P&p0)^%Av#{7w6JDnIAM9om0T zTiih9QWYGMlx*i*NQ<Ua4tm|!}j*n5pJM$q(0&XS^#wv8O=Vf0^-S&v|R;oCCUl>eAL2d zOd?ZgyOMJGN#5C7Un-ZFQ9Y8jlgeUseynLMMjzq^8kfJ$nIjmZasBJOiwQKYf1Nigfwr0Y z1aVDQ9`z|QmG(9&XGnL=&<8M$YB$h6Tv69?Rb599;z?Q&FVdQL6Gus1N9EHs&Q|Dg z|JPQ>T6Kbro_G+5892a>?Ap0=h_`p!w!VIT{rk6Te&p!OWx-d9&gn9oGr zTjk|l=A-Lv+UUBEM^|0x>G7i?*}sJZ-D_&E+dhMOn7cj9p!PArR|kyn_DW~pA-a!` zK4jIlB88|#E7?{gQvOjZw7u})!*gYc+%8`ZaOOe!H$b+(3fXZuWTz^~;4H`oHb8dv zhwO3!vTHJAw=&2up6f9QGCT#cHy`LDCP4O`3)!z2vj0NJ$b*mr*msa0WKX2p z1CV2xB!Pj(fgFQ;G7&N{1o9~ha{La+r#C?+t$}=IJLE)f$Vp7dFFQGzv8RlOoXU99 z7C}zG4mqO{a%Li&a@HltIXxixF)UN*JfAwh2y!t4WE_WFLg$w`(#$}}SE3=84&+an zP{`#6A+sNce045l&LqgyEaLT@kZ;f@m!n?S0{PZT$c>D>sQ@yMiMOtY+(yl3&h1Ab z3lt~h4vzFa1}$V&@9%@$$ywONk?t;p+;awUpC{P_`7slG;sv>XIphHbDq)aP_CLf# zpE1FatB_x0LYA@Z7=6o!LjHIM@?IZplGURz@HRS(%ATR8K ztVx5sSO)p~63AL!>$(ca`WVRTOCcMmx5h*M!)xEfgw3}g?_@)^uTLSM2RdL~El$_0*OAM|A`c6ki+Yz_L# z9nf<^psx;uzGg1;H)^53$vo?`p}#c_`Ub|@)Y}Pt^DgLHI15|poL>$79R_`u)$L%# zg-rTB1AV|CMVFv|SPFf24)ndL&_80q#mUe=84mpb1DCFberPiE&(fhEPK17xG0Vn4 z|B^9|t%ZKPH}r3rw7eer_l#Ll2mPdT0`$sw=s$6kr#KToQ%@g-eg@F1TA-hgg#JGk zRl_O!JrjB@M}2ub^ea)&|5yqAPZoVG4|+Xk<@!SCHwvKNVquL{&|4V$-a!~1gJF2) z!f5RU!!aF(SPp}q`i8+{rx^^RO(Bf7=V18N!tkF3ql1LeaXX9vwg+~F5#&eCzzE(7 zqw^;)Ld#%u-2kK82^ihi!{|`~BYZB5-pMff&?ll4Mn5L#-wY#iEsOz;Fb4I55j7vi zgZ?lcS`8!m3XF%R!fC|B!x-jG?!Xuk10(h*jFAeAQA1(Gg~J%l%Ex>IBigcZXA!F91J7z9E|Zi|8xLhoM-4iVGWFlVKAQUP0C?R-U(yMRKmihrI70| zW>h<2B-g{3*%iiYCQM=FbJ_8^@i6AG%K3Cms#(3tQC$<2A;3tr^DaENTre!5a}U)>gw<=Ntp$tqK?$ zJHXh)6M4g7Y>9`ll{2x8LGzEpczXwocQ(K%*aTxo4;b%-!zerk2zY-(7+6!&(>>b7B0*DL%0V#>om8r=nq;=5+qT>d%zJ`1N}jXE~+Si(p*11fz!2 zf3Xn8r3)}>XTkU*1xDRb7=NZtcKC( zPx4{>!@`;t!nj=zqnX$1KL%}?1mk`#Ob=heXBp2@n63DP?8PTFZ$27&AA#xmeXq2@ z{d+)kOEN5LFZ1v8#SJnj#3Ec1<91oJ6pKbTLigqg%gxo7UcoOBiDWIjYq<4C5@hdG0z zm~|B9>{BpP=rD(x8V+-QCd}tQfyqT_zAzW&A_mRq4Rgs*n6CuzshovoQM2yBT%H7T zMI+4YV=!}qVXpRp`FcLgHHqx^2B+#xz|3Wm^@Cx)#VR)zz}$2JX5LzuTZR+P!qy!y zw^hS@o0Y$P1m-*Zx$rI%?%*ijW3cxlVD219SYXj~m>gLyDZOJN>j;KLlj;S(@FkAztk0`r&!^Q#Ud7bX{~`Slf; z-!#Gej+f_qPV*0w35%{^fj=_Q30{_y3t?7fz&yp|{Mt2tSq<~dc9_4;f?35lXW92$ zCd~64c>T|R53{-q=7p^=Ylg$T*cIlbY{DXbZ-#j#0_Gn}Vg5M*<~8>DYdXy92{3Q0 zhj~-NycG@eZ?^Lz*Zk)g%-bO_n_0xafiUl|fIDn&35Iz$9Oiu=Sf16eymr89-2lts zoDNILgQaP(WC$!h4VINmF2J(uVfoyG<+}uyUl=TZgKUM>zBerXCbBx-fz>G&R!}yq z;482~R>JDS7~SGw_2>bsR}!o~Z12mqeig7HnJ2Od)_}RN26@7Yih||jZzAgtYb*mK&}UpEti(82PYs1N zJ_lA3&rg^DYmx%%S#Ma=cy9V|STjg6nMr1m*(4r-U@ch*D|0EVR~8bEX6Y%8;smU$dRY9}wX$iiWWhPdV7*ofYfT`m zwdt_daWHSO@Qo~b^DJ0fSlBjCC#-xnZjXmmz~DO)VHMJ$@Nro0bF?3X!YaBBYnMe> z%swwzAI*nVOrKBg!Pl8)JS2^%r0@FyYM*ShuFaY8(lxsS#E) z2XdzaXRc)fth*Mhds(pVU*J!wO|U%^2yL$-*sZ3*vc{3T5nPeTTCW9VDs0y zEpuV(Ctw>PWD#sLlzao*o52xL}6n4OA*nw%V zgB92z;jlZ$!491Ty9+yYW6-cqV0X`g-J=|Kcr)zYS7Aq_!tPrLyT1W@KrHNmEGB9y z?7=K(a2@Pu`VC=`Ls-be2Vf5$4|~Kp*s;tvDh&2$wvEYl!j4}G`!PC;gZ=b;*h!7BCyaqTiB(V82YV`$PUpyGOou)5I&6M4+jCgpa}lHhc4|KCc`2~x z$G}eGY`l;JJDtg2%!a*aA?%EPu$Oqkewpo=&!oe4vQp<7*vsQ#X9vK3mCh@fEGH87 z>U*$XXVA6m^X3uQ>xL5+yMd$L$RHc9z}_4UJFgb@mJ_hIWx#%WIqY{nSyfgpiB1e+ z5{uZxhqNKSq%H9y?MlkZ{onUqnD%Q`n- zrGL})+KX4N-S_V13U=kMTONwyb42M+T1w4`cw;Nk#}9wqVFf!~HX z)1kbP3T3T7_lGU+3pYSnUj^l@JSZEAxHn8T`;ulTc}KWETn1%ZFqHgqC~wz8+0OIt zkb*EM?~bP>Pu6!vH9|xaGTxeVn`FpzKK@wNUob zVP6cCkCMm%D8+lAd`$hMg`3Wyq!7xd(cEXwfKsB6G{S;Q^Pn8!xz7>_`yQsx5%PID zl%u|+63Q2)P|A{_d>ISnSR$0K!l4|G;?DWkO!iF`l=3hr-?5nQrxFIOWS~=Q`RHrZNl>oy*-p8^L=Eh8^E8xOlc4+^3FRL;H?h*&{-hR4GXwt1es}Vq z{8t5~jZp5dfr>2GE;&@s0;pcuP+L!e>Rk?11Vc6VK(+Fq`V>R;4Taj4=loKk zwo8D@EgiLk)0h7=Lk$Rk+KDFu*&(P9YA_u-PvvfU3)F5r4y%XSgTcd(L+w=uwNE0{ zh;*oZdEAfw{n>9o4%C6A+)=NF8pQ$zvw(*fX9(jAO@kUE3HuF?hdLqw>LYA-j^x28 zo{S5HI_3b>_)PAkmqAU)h5BR|)I@fAib=-Ta3`H3;m;;@;v}fgW<#AE3v~+Hrn0!{ zNl=rcpw8s+Y{pET^e+&dY*2pZ;mg^FjgCbRNIBhP&%W;8Yhg_)DCHCDfN2 zp}rCWb*Vp8KAEb^7<73x)D@N7a%Z5N2&k_WL46%i*Mve{n-4XY$<{IO`aR%|JJ|qr zV=dIp984bBN}p}@Q1ct0Zcl|;z~h1{sPCSJx}(Yo^}PzHg$(|F8Mob&x!s-sbyphH z-PAof+-B#9_7y<=sD?Z1Yq+Cc4s|~ZJTQrS>A_GBra&!a-_IEIFzq8O>>*k3sbZ7ErMV>W_&~Ptf6HG}KC8sHe!!O#VwM z)L%28p5?i-$Dy8M;PbSrBcT3|=YI<)OmLC?F9B+8Jk%=zP_N}c{VNjc4U05Gy~zRm zoeQ-o1?ufIsLk|u{_6#`g$MT(QVI2bEi?}cnr9SgfYz#+8|bH@wN55HRzgV)G%b#M z=JDJs&w!>UKr_;znf1`Da%grjv^LR%{e7oG>OAHEr<`_Zn@CH_CVuzz1F=NT8{*1JyW2C zvzT69gnqr#p!G>5HQZlkVSVeM^~;9VUlM90V??$<8yN3&ZM2g}Xi*!WJxB&OLVJh- zqHCcIVWOez{BQs%gEowX4ljTf8w2f;B4{HMp^fq~wt8rn0J&?ZJho8(34JUNCt`3hnCG}?S2 zrOgN<9L-FQgtwWNk_K%K`^;g{a|@xR(r?~zX!En6JzvEQ{0e9bTcD-$+>1=Om_9GD z&?TXSeVs2eKxQyur&snsTbjehWN2Bn(3bId`5I^|IHK%GXs^~lTSey_3)*We^fmgt zPTx1Ca_3(X7PbzAiPtwk+vp2!_LDqldF-==ep~9HZO!Kfe+H@H_0NxkmR}6*ZGVzZ zDxqy>vh5q7y~Fkbw!a%eYM}93O)HFnwv)~u5Pq9!MGW>KV|-WuZ5R9OP9rRAuNR@; zzCvgpF=;XT^VZe)qf+}6&<-X-E2-!8KU4+na4EFU>A-tdD~lm@(2lW)ubAMg9B9Ym zpnV+*jnCxTchS(kr}GaP&`xAStEAsg)SsE`v_%@Aok@UJ#W+=*y{al`XW4e1=c?KE zzgW@;t%h+f@$+B%y%-wrS?zKPv_Ddz)zRr{60~cy>(iiJr+tI{ZftG92HAO+Y&GvuU?+)8q;-TGRlKZD2kP6|UKzIV8l|Lzl@b-n^{|_Meds3)ubE-8E zS|fxEh0wzwj3@|`9jqh>I}5_cizJW+h&E*qz6B6%10eizA=>f0e=$UR`gE8C(UHkI zWiN{A4Das;AtI7DbHDT7mV$$;oeXTH4W;5 zhvY&G4JC~GFpG#`&X`Ik#IQKRAlz6Ku~P}{N9rL)vh&DBh`4l!(VWUL#Srn)5Rb7C z?$3zF8z9EAAMb1N1QU(Rf_RcXi56k|Q|vcBo*aO9dJRMp^E|`CCiy}<8w)X+v8Ff^ zAf|>x@ctIlDV^o2jl~d~5+OE6LF6$R?{TrspHxD; z6F?ZZpaA0CsSrDY36J07abYsA|NAU}PpD$&9*7UpAc`VMGsG^AW_LWq9u~2e=RcB! zBm1}rVn2)B&qN29{6Gc7r(M@gplc$&M%EAu7WmexjbD6Sv&O&kTA-A?#n}1#xx_#5sS6 z^XyZd4{?F#F6@E$EeV3VoZ?~>#3i2log@Ce4x*NR{8|=Qsv+v=|7R?5wm@8?V|_Tp zUv$1+4AH>jn`EL@Ih3|_rB6wa`Ae{zZCYb?{7T-YGe1T-wLAD7c`H;SJ zY#T|AK>D#?JHBx8Kg}1B5u})~Z-;172-z`%ltKo8WD&l*>(l}nNdF)UGT4jMLOwvB zka%(&k`K5}*_qB=njyP|L53wkcCUf#Q3TmD9WtEGz0x3i=R@`hhl~h-?8_wmSwN%< zCK$j(gHj-)$b)Mj2Nys-6b%{8zC&2dkYvcA^x?Lv9F_+;oaaVVLq5WOBcu6lZ`20J zxE#pQJo%_UB%grgV_|%o=?ghl@@*yqJ;4!-W1)#m@Du}#PvV=*P{^dykQ3-Lk;jv! z5(a*jg*@8;Ihir1Dv;Bf`8Kl{az-{}at!3mbjVpuKAW*prX)hnjU{=I^VoTQJmmB2 zlokcKAPkb<-SUN8$QR=v7o|Zi&VkHeznAj))|35~)Iz>o2ANsIH=pdcv;s1V@s?G( z-XLpxOU4}z{LRZ_Z%Mzhz$=!Qx&RF&0Y3%ixAGD(h}(SRbl{0rqR4Oa6G1_3O1A$J zxc|MjzA4k@Cr?RFd2!zK7m}Y}Jb%ipIjN~7PrMXVI&`yA8r0b%w3cXv>29W{*=+Mv{+gi zmX=nD)kZ6$#b{}1AuUGIVrgozkba-%@p`@Y`JQvW=X<{A+;gAjKIdwva2I~&&WUx8 z&^w$1TBiV=8)ht+GCybT!a0Cn9Dt=WQx?r=jHsQ)axK)dz?p2HUllMJ>dh87N0ui~ zpOVyf$eH%=pP51bfyu1U`&qqNE@3$^c}`k-hsmRSSUv>=Riwx_*_Jx*xwNsp9+(dQ3LCh7Z2<>pb+Y3w zbT89911#VG+s;0-n&n`i*MdEMt+uz)^V!6It?$}X)%qRNT?@Fn!fJbh{7AbS^^6y| z?xxlgE`ckMdV%~xyBGC0a+!7z^$&8D_Px|*FL3pvUh@Liebg2&aD`BBc!BGFSnjs} zvhW`}_lMQa_5#-fR1VVa9@Y<}4)6k381+Ffa1EvoCz13SLX9F5X-7~ed4X#@HIYnZ z{gc!rFK|tu&h+AjYa)$VWHy}=s3~6H@&uXZ1+K}|XUTl}cmk$*fom#tu@|_eQD5)^ zmuDb1$)x{u>T)k|c?Nya3tY+6RUW5Rbn+yynyjHco0{zfE>AM+$a>b#p}sz{{_^oUf@cn?(hPadl8KyFK~Hg@}3vCmQdgK0#^q0 zBQJ1yX85rexRz4Oyf6^;GcRyuQumVz4!n%|r5CtXP!D^7YbEsvuYbF5=;T?F@4dj~ znfXaCaIK}DhUFSWAFhJun!AS5Zln(P0v9)*Yb5dPgC^=DUf}wRI*RbtadA_6_JS*( z_H`;RGlA;{+?MA$6S!_tr+9(u7M0hN*9)$Hsa$SXDxkHd&L?TKeW+Yk*FxGZDp!v{ z)2Un;0!>i40-QNCNnJ%&(>AG`sB5j81&79ZFVH$rbID%T`%*vk0&NJD%j>FQ{ZQ&r zFVH-*{hAzOeKfU(d`sIi^Y6Ssi=lFL3AD$lTwT`>v`16jXZfd|g)!9gIEA2fi{qEA81@Pjr%|wLHjl8Lu3N& zJSwlT_B8EXR9;E~Z8w#-BZ0Pu`V6l>|3E8Y!ISM~+8^fIO=O)wzZSED_ASUf$RPHaGmq3r8@)GFX zXmj7_-HE$93)~<&FM-~h_T$uGFVM$P?Ido1>#bLk8rrK+nATch^%0wJjPks+*?)Nn5lcT#zystDG5271T~L>KDAULd+sxh>VB z^zox|SE{kJxlI*!pPInWO5qulcea{Lo7+@PCA_mm2$fq*@##$Tr*iwLXKC}kP-$c# z?ZMOxl1ckP>TRDFqB=IaPqcia=>2uVcB$W12>L9|8HL;G$1PKJUzrmFw7$vy> zjS*fTxc?1iOCUB<#}LnQZK94NiL^IUxk83#g}8CeIxi4KE9$zgs_WW{v?gtc4{1x< z5m#wlSMB5MRS&+a5uJ$A2j7)5{?@BRFc0SLz&@x@`VQ;@H7Euu zY#r3#IH)1>p@v37g$F=A$o66Mk1$C+)Cl5!CKpRH)PSP<8H( zP(OVDbv6yEz7p#EQmCJKt$(e7x*Q4h`*Ns1s8=UIHK#yb zjFGKjM8?91qHpvl7^9+L#O#DInhD0PgAqr29Q!=k4@P_yj0pqbHYPIYq$gk`GW#jV zVN7M<>HA>JWD>J7V9Y)ZBP9?<>QNZ;t6`*Vfw3S6#-f*CEa5CN&cj%`8%8FRT^0#r zg$d)u9WYk)g0Z>>jF;!a$ZmkKj^n(N1!Kc_7_TzcYyDwt{J;$(kIV2nJHJs6V+(^8 zFuSeHcsmCzWS|`k^3FvVMddJdX2U2>h4BFs{xBKFM^P~LFmUNQ7-dso>`jNUFCNBc zjJba_j0(m$umQ#w9PAJWJ=_H22xETL2;KJD&;TXU_V<1Q@@B!??HxMgx<+ln>)FSLOEwFs>BBxXQ%-s)KQp!T;R{ z6T@J(%7y8p!E84Jrg#aaY7Nt1*$jl~ZeIk`_YBNC8erZz8)j!4W|wU+yRyDpADI4K z$Z43}x4`W23Cz1IVfM^}+3PsWpp7tl*TB4YF3i5kF#EC3edRFwbAbN0U=G*-GqeTf zz=1Fa&4(H02Xn|em_skY9F_!gcr4szgn$`w8|KJJm=7I<`LKc+H4^3{Auywv`J+c+ zKGq3l%x;*YSHg_-hdG9AV_1G-7|gL}V2)$^_yEE<@$COp4$KL`FcbQdYM4*&ggJ== zPG(|>DdbO>Q|n<)YjVR(>H~8I2b{^wXVG!?1ehtzat=GrB#tz~%s2saDQD+SfVqrGui%VdWMVJffSJV@S+`)WVNx&i5@d(MT+6|8 zM#J3Tu7R2B5A!uPY>I-J7Yp-suEb^reWMCy{tlR1@?gHT8Rpi0Ft>%k+Kpz0+hfH8sD$L#EVSXF~vy^Rnm%`jP3g&0*yPt_12!eUA9l6bfzqkhT zOEwdk?2t@-CIr@;OjvV2fyGT}&7TYFc?Mm`N47;HVPyosTFOM- z)XdhfmLl zB;%Z-?+=-Jye3#_wIuC$eoy6zr*F8c8D4$qX_x5_WO|-1aPHI-5L0Qpg-K zuK;%HLD>=_?g4vkI_w-yW&;z?WzrjG!_H%3o7=&DCZUW=a*nt z(D%Sn*k9PND+j{<@)qpF^slOfebgNR`>STy$9NgOSqb}F&g{Ev*tG$Kfln~glYy{L zWx)Qy2lnaFuzzCtY#i)!T;g*a?B`tAzc6`jRGS~U_HUuEFO7$N`8@1DIABvR*jJNa z|1}Es-z~7Ob0Yuv!@ilvmAmB&``?wYZ`1j|&2U=9k@Ilc6vOcmWH+34p>SM>;OPBH z2^=w%?0_SENiH099FEb8EQVtSk)v?zNn{%wryfp+@o;>1!s$4Y9E5Xc3Y<={q#SOi z>nS+h(%^JgaPA6$(<27X-Lv5Y(y14N-t!5Zpp|fXSHrpY7M#9U;M|uAC!`2Y|MqY~ zqv1TjWCkU{8O($RH^Ldpe&I|qoQVu8gEL|RoRMeXJX8)RDi}^Q>mJR5^Vo7XoEUZ( zy&O&~gFI0JXKW#yaVDJc^Wi+n_YhBwhBJ{_PudMI8a%XAMkxp-ST-EkmC(@a8Azg`IY1?z%x@Y;VKK}Ga zldbT-(WXrU`0qk!G*3f3I%e>uh*|!FT9uTh&+=dBSNhkB{*^)Q3TSInc+!{zEhiG% zhG5bN?bTa6Wh5Jup>2xcDWeVTbzf+k)1c-1L3=ZTuzd@8D+5|V0yzb3E6dv&plz># zR+tFw?Qn7d+Kwz}?{J)=RA}$U5&G=R=PBrW< z^7t~Hv_LD#;fZB6v`-R9CA3l|T-pe&jBR_1pzWhC-zjP39;%>ymJIFlKxq3FDT7v# z2aUh^w1b(@zQ~4FSY7p54?awS|&FuU)Grg7q?Rpqtz<**%Bea{r&~9naZby@Pp1aoa zyfqGbt7hnJPC@tC1-+dgbdd(#;sKY{2)(@z^bYCJec5(L1@w-EJd2Hl-Z>e17k3Qw zuBp)d*wBp*{w>f0*r7)W^q#TMd$Al80lhba2Y2H6Y&dlOc+l^wf_^{C{n>v2{X*+_ zE~}sq3W3fa5BgvxFqCn^8Rx-D=))6vCQH8&1<*$pLXTwq!?fK|Y@70s0de(8tn=KN$4!p@cJuPk=sQ7xaWv(4WrZ*(~c4ncS3O=+m;HC$T((L1#8W zpOp{&85?>^E%dqUKabRm$KK9s1fP=<7LH4g+rh^jBH`Y6H(|!=P{CWb(-C?DIwh z^!!NZZ&pBmi{*k~=v#xJZ=-Gxa6>O-@V9+=fLq3c+d}B?RzlxNeXow^wT(QdZRYuG zD5;13kstKkDbV-q;;C#J^pDGVB1_+W47QKk(1|ecY1%)o zgkHz?GnvrOa)5gJpNoV3a{=^UQlVd}gWi}0{Ynz_KVqO?j_wnJ2QW>s-VW*dz!)4Q}Db!Mf4eKNzAr z69{0CfEI|miXnQ?@$QunfoTvuIcTp75J5a&4623b9YP8r`jkW5%VdJ%3H$Y}gy>fR zabGA;YMI#m;p7xV|3pF^z!;&i5D&1=z&JPmWI+sSfCwW)q6q_phk1@|37v_nlpWrb))DLL;uHFKbm#_WB*tMF(!yqLp+fJ zF*X}wTpYxc?of#M5QwJ&AtvNNOpJ#}VCScEc_y3yF`4y=w5P;DOwE9p#@QrsCcMqW z%t{D87>Zd;dR7ZW3j59JL~0@C1w%X=05Lxn;yJdZali%alg>mJr9&*H?_&0MFG+*Q zpwkN=br4I-ATq-sma)979%4CXv?2@Q#ZZWs*m+eFL>3cW%|2_`H@k#q$cYf^nOII7 z#48+lLnK6QGQ?{vzt#w`i9UJk_j&|rg4kRQ@kS`g=k?F`fyhrGRS<6m5)Sre1H@ab ze~a}6Dp&sX8-z7oRMnZgF2*ICE;$%INhK>QT}(d-NHcQ(W| z*0<2_2J3DXK>W)={tF@%kVt^!L#k|@0@=m~vTZVCyGlq`Bc#SUzSNU$5e+HRAyo#X zkqv3m!77HdYayL@QV7{T60(CYX@>Mog}mbeWJk7l@*(Wgc^70C4%VdxvTGxxUlt^9 zY3W}E*`09%0wH;3AbZ#(6Y}mn$Uw#mtcF|mWaoQWxQCsC8X$Xf&_3ai!Eum%8K57t z?pF!P<1!h-AomAA_OF8+KwsX+GPD}9S62m!W1e1!$cSDX~kde8N50yajOjbS|LFgP64f#kFWHgtO|8qt@mIE2XL>^}n zqaz{zM?c=zGL{34sfB!kea0q1#<4z*e&Y%t$7`e>^2vP2cqTS688RUc@@dAJR0uiQ zoe9bNTTTrm3^YA}WI)bfrZZSh4uYJO206PN@)`O(lLeVVdkzPiOTT%iAX7QmvvrWq zRX{!;2Dva8auNG1iGj>u{}&=5mvWq?)x6$}kr@rSECg~nW4KpDK(0)NR z{~!_aL(Xj1Ey&$Wb`J;I!@)}eNDbu2Igp=JK$g*GZ#3kmeuVX(vHyPB2iWIeBV;9$ z`Z5XfP&wq`7RVzpy#7ZSygC^2Yi4$gj>ifhzsZEGp?=Fw$EzW~W6AWW#vKHxlm3xRQq(& z1m(+)zI=6ZhYi({j&}z0^;-~G3Dwz$(6@6AX@Tle4b_z|iMqy-S|~rh%jp(N*xx@1 zs(U~mKERF6)igtYLjR?iryUKvpL6hrk6CAXmZR6*U#&cT&XeVd^AWkTJT z3UxmR>CXfP5Z?Rh0S+{<9BL2=tA`rg3^gPNYAAif<476QF!mW<3l-4_HG*vqg+N8p z?_t_e4ScKhNF7u(8%L!;@d;SPWbi#+GSuiqzQ;?2iscN(v_OsJ0CDUzu9)xe()s=_ z2JnZWYI628L=Axz}yNWz$t6QHKVKuz@_r=X_gLM2r}P3Pb<7;9z`)U1hl{L=`P zLgzUJP;==tFB>W~1B&0>YW@YNw0x-NE1?$DK`o?TdK1(l`YjHFTH?$1eW8SYO9Oa4 z8E;vj=e?;YF1=Cif7Yi}ap~y;{ugZ@H0jTlRv!1y=XXK0jM$WP!v9!l=t=*>+e_^w c-OGk;I Date: Mon, 2 Jun 2025 17:36:25 +0800 Subject: [PATCH 13/42] =?UTF-8?q?[tv]=E9=85=8D=E7=BD=AETV=E5=B7=AE?= =?UTF-8?q?=E5=BC=82=E5=8C=96token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: kangpeng --- .../main/resources/tv/element/color.json | 34 ++++++++--- .../main/resources/tv/element/color_sys.json | 34 ++++++++--- .../main/resources/tv/element/float.json | 56 +++++++++++++++++++ .../main/resources/tv/element/float_sys.json | 4 ++ 4 files changed, 112 insertions(+), 16 deletions(-) diff --git a/systemres/main/resources/tv/element/color.json b/systemres/main/resources/tv/element/color.json index 8276ad5d..e653cefe 100644 --- a/systemres/main/resources/tv/element/color.json +++ b/systemres/main/resources/tv/element/color.json @@ -14,7 +14,11 @@ }, { "name": "icon_emphasize", - "value": "#266EFB" + "value": "#FF5291FF" + }, + { + "name": "icon_sub_emphasize", + "value": "#665291FF" }, { "name": "ohos_id_color_emphasize_contrary", @@ -50,7 +54,7 @@ }, { "name": "comp_divider", - "value": "#33F1F3F5" + "value": "#33FFFFFF" }, { "name": "ohos_id_color_subheading_separator", @@ -62,7 +66,7 @@ }, { "name": "interactive_click", - "value": "#1AF1F3F5" + "value": "#19FFFFFF" }, { "name": "ohos_id_color_hover", @@ -82,7 +86,7 @@ }, { "name": "icon_primary", - "value": "#E6FFFFFF" + "value": "#E5FFFFFF" }, { "name": "ohos_id_color_tertiary", @@ -322,7 +326,7 @@ }, { "name": "comp_background_primary", - "value": "#3C3C3C" + "value": "#FF202224" }, { "name": "ohos_id_color_button_normal", @@ -380,13 +384,21 @@ "name": "picker_focus_option_text_color", "value": "#E5FFFFFF" }, + { + "name": "white", + "value": "#FFFFFFFF" + }, { "name": "gray_02", - "value": "#EBEBEB" + "value": "#FF1A1A1A" }, { "name": "brand", - "value": "#266EFB" + "value": "#FF317AF7" + }, + { + "name": "confirm", + "value": "#FF64BB5C" }, { "name": "multi_color_01", @@ -475,6 +487,14 @@ { "name": "multi_color_aux_11", "value": "#FFBF00" + }, + { + "name": "comp_background_focus", + "value": "#4DFFFFFF" + }, + { + "name": "comp_focused_primary", + "value": "#FFFFFFFF" } ] } \ No newline at end of file diff --git a/systemres/main/resources/tv/element/color_sys.json b/systemres/main/resources/tv/element/color_sys.json index fd45cb98..2f76688e 100644 --- a/systemres/main/resources/tv/element/color_sys.json +++ b/systemres/main/resources/tv/element/color_sys.json @@ -26,11 +26,15 @@ }, { "name": "interactive_pressed", - "value": "#66FFFFFF" + "value": "#26FFFFFF" }, { "name": "interactive_focus", - "value": "#4DFFFFFF" + "value": "#FF317AF7" + }, + { + "name": "interactive_active", + "value": "#FFFFFFFF" }, { "name": "slider_hover_color", @@ -470,7 +474,7 @@ }, { "name": "font_emphasize", - "value": "#266EFB" + "value": "#FF5291FF" }, { "name": "font_emphasize_contrary", @@ -478,11 +482,11 @@ }, { "name": "comp_background_tertiary", - "value": "#33F1F3F5" + "value": "#19FFFFFF" }, { "name": "font_on_primary", - "value": "#E6FFFFFF" + "value": "#FFFFFFFF" }, { "name": "warning", @@ -490,15 +494,23 @@ }, { "name": "comp_background_emphasize", - "value": "#266EFB" + "value": "#FF317AF7" + }, + { + "name": "comp_emphasize_secondary", + "value": "#33317AF7" + }, + { + "name": "comp_emphasize_tertiary", + "value": "#19317AF7" }, { "name": "icon_fourth", - "value": "#99F1F3F5" + "value": "#33FFFFFF" }, { "name": "icon_on_primary", - "value": "#F1F3F5" + "value": "#FFFFFFFF" }, { "name": "background_emphasize", @@ -510,7 +522,11 @@ }, { "name": "comp_background_secondary", - "value": "#33F1F3F5" + "value": "#19FFFFFF" + }, + { + "name": "comp_background_primary_contrary", + "value": "#FFE5E5E5" }, { "name": "scroll_bar_foreground_hover_blend_color", diff --git a/systemres/main/resources/tv/element/float.json b/systemres/main/resources/tv/element/float.json index 9f15b81b..d842c6ec 100644 --- a/systemres/main/resources/tv/element/float.json +++ b/systemres/main/resources/tv/element/float.json @@ -235,6 +235,62 @@ { "name": "alpha_40", "value": "0.4" + }, + { + "name": "Display_L", + "value": "80.0fp" + }, + { + "name": "Display_M", + "value": "64.0fp" + }, + { + "name": "Display_S", + "value": "54.0fp" + }, + { + "name": "Title_L", + "value": "48.0fp" + }, + { + "name": "Title_M", + "value": "40.0fp" + }, + { + "name": "Title_S", + "value": "32.0fp" + }, + { + "name": "Subtitle_L", + "value": "26.0fp" + }, + { + "name": "Subtitle_M", + "value": "24.0fp" + }, + { + "name": "Subtitle_S", + "value": "22.0fp" + }, + { + "name": "Body_L", + "value": "24.0fp" + }, + { + "name": "Body_M", + "value": "22.0fp" + }, + { + "name": "Body_S", + "value": "18.0fp" + }, + { + "name": "Caption_L", + "value": "16.0fp" + }, + { + "name": "Caption_M", + "value": "14.0fp" } ] } \ No newline at end of file diff --git a/systemres/main/resources/tv/element/float_sys.json b/systemres/main/resources/tv/element/float_sys.json index 72a6bce5..341a6f33 100644 --- a/systemres/main/resources/tv/element/float_sys.json +++ b/systemres/main/resources/tv/element/float_sys.json @@ -763,6 +763,10 @@ { "name": "ohos_id_progress_button_download_height", "value": "40.0vp" + }, + { + "name": "alpha_primary", + "value": "0.9" } ] } \ No newline at end of file -- Gitee From 880cbfffc2f8525009c286ef4f6f9c654d0ec022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=B7=83=E8=80=80?= Date: Tue, 3 Jun 2025 11:06:00 +0800 Subject: [PATCH 14/42] modify Fido2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张跃耀 --- systemres/main/module.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/systemres/main/module.json b/systemres/main/module.json index 87048cd9..bf87c03c 100644 --- a/systemres/main/module.json +++ b/systemres/main/module.json @@ -5608,10 +5608,10 @@ { "name": "ohos.permission.ACCESS_FIDO2_ONLINEAUTH", "grantMode": "system_grant", - "availableLevel": "normal", + "availableLevel": "system_basic", "since": 20, "deprecated": "", - "provisionEnable": false, + "provisionEnable": true, "distributedSceneEnable": false } ] -- Gitee From b408ee36362dfe996b122c0cd8e47e09643ba0c7 Mon Sep 17 00:00:00 2001 From: kangpeng Date: Tue, 3 Jun 2025 15:10:09 +0800 Subject: [PATCH 15/42] =?UTF-8?q?[shadow]tv=E9=98=B4=E5=BD=B1shadow?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: kangpeng --- .../main/resources/tv/element/color.json | 24 ++++++++ .../main/resources/tv/element/color_sys.json | 12 ++-- .../main/resources/tv/element/float.json | 60 +++++++++++++++++++ 3 files changed, 90 insertions(+), 6 deletions(-) diff --git a/systemres/main/resources/tv/element/color.json b/systemres/main/resources/tv/element/color.json index e653cefe..b492b872 100644 --- a/systemres/main/resources/tv/element/color.json +++ b/systemres/main/resources/tv/element/color.json @@ -400,6 +400,30 @@ "name": "confirm", "value": "#FF64BB5C" }, + { + "name": "ohos_id_shadow_default_xs_dark", + "value": "#FF0A0A0A" + }, + { + "name": "ohos_id_shadow_default_sm_dark", + "value": "#FF0A0A0A" + }, + { + "name": "ohos_id_shadow_default_md_dark", + "value": "#FF0A0A0A" + }, + { + "name": "ohos_id_shadow_default_lg_dark", + "value": "#FF0A0A0A" + }, + { + "name": "ohos_id_shadow_floating_sm_dark", + "value": "#FF0A0A0A" + }, + { + "name": "ohos_id_shadow_floating_md_dark", + "value": "#FF0A0A0A" + }, { "name": "multi_color_01", "value": "#564AF7" diff --git a/systemres/main/resources/tv/element/color_sys.json b/systemres/main/resources/tv/element/color_sys.json index 2f76688e..d071829a 100644 --- a/systemres/main/resources/tv/element/color_sys.json +++ b/systemres/main/resources/tv/element/color_sys.json @@ -98,7 +98,7 @@ }, { "name": "rating_container_focus_color", - "value": "$color:interactive_focus" + "value": "$color:comp_background_focus" }, { "name": "rating_unlit_star_focus_color", @@ -214,11 +214,11 @@ }, { "name": "fg_progress_color", - "value": "$color:gray_02" + "value": "#FFEBEBEB" }, { "name": "loading_progress_focused_color", - "value": "$color:gray_02" + "value": "#FFEBEBEB" }, { "name": "ring_progress_fg_color_begin", @@ -350,7 +350,7 @@ }, { "name": "chip_focus_color", - "value": "$color:interactive_focus" + "value": "$color:comp_background_focus" }, { "name": "chip_usually_icon_color", @@ -386,7 +386,7 @@ }, { "name": "chip_container_activated_focus_color", - "value": "$color:interactive_focus" + "value": "$color:comp_background_focus" }, { "name": "focus_animation_color", @@ -410,7 +410,7 @@ }, { "name": "tab_bar_focused_color", - "value": "$color:interactive_focus" + "value": "$color:comp_background_focus" }, { "name": "segment_button_checked_text_color", diff --git a/systemres/main/resources/tv/element/float.json b/systemres/main/resources/tv/element/float.json index d842c6ec..1d4a7b17 100644 --- a/systemres/main/resources/tv/element/float.json +++ b/systemres/main/resources/tv/element/float.json @@ -216,6 +216,66 @@ "name": "ohos_id_scroll_bar_active_width", "value": "6.0vp" }, + { + "name": "ohos_id_shadow_default_xs_shadow_dark", + "value": "10.0" + }, + { + "name": "ohos_id_radius_default_xs_shadow_dark", + "value": "10.0" + }, + { + "name": "ohos_id_shadow_default_sm_shadow_dark", + "value": "10.0" + }, + { + "name": "ohos_id_radius_default_sm_shadow_dark", + "value": "10.0" + }, + { + "name": "ohos_id_shadow_default_sm_offset_y_dark", + "value": "5.0" + }, + { + "name": "ohos_id_shadow_default_md_shadow_dark", + "value": "20.0" + }, + { + "name": "ohos_id_radius_default_md_shadow_dark", + "value": "20.0" + }, + { + "name": "ohos_id_shadow_default_md_offset_y_dark", + "value": "5.0" + }, + { + "name": "ohos_id_shadow_default_lg_shadow_dark", + "value": "20.0" + }, + { + "name": "ohos_id_radius_default_lg_shadow_dark", + "value": "20.0" + }, + { + "name": "ohos_id_shadow_default_lg_offset_y_dark", + "value": "10.0" + }, + { + "name": "ohos_id_shadow_floating_sm_shadow_dark", + "value": "40.0" + }, + { + "name": "ohos_id_radius_floating_sm_shadow_dark", + "value": "40.0" + }, + { + "name": "ohos_id_shadow_floating_md_shadow_dark", + "value": "60.0" + }, + { + "name": "ohos_id_radius_floating_md_shadow_dark", + "value": "60.0" + }, { "name": "toast_padding_level8", "value": "24.0vp" -- Gitee From dee6547ac44b3f584dc263b04c44bf45ba9f6698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AC=91=E7=AC=91=E4=BD=A0=E7=9A=84=E7=89=99?= Date: Wed, 4 Jun 2025 09:40:26 +0800 Subject: [PATCH 16/42] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9D=83=E9=99=90ohos.?= =?UTF-8?q?permission.PUBLISH=5FFORM=5FCROSS=5FBUNDLE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 笑笑你的牙 --- systemres/main/module.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/systemres/main/module.json b/systemres/main/module.json index 87048cd9..91471bee 100644 --- a/systemres/main/module.json +++ b/systemres/main/module.json @@ -5613,6 +5613,15 @@ "deprecated": "", "provisionEnable": false, "distributedSceneEnable": false + }, + { + "name": "ohos.permission.PUBLISH_FORM_CROSS_BUNDLE", + "grantMode": "system_grant", + "availableLevel": "system_basic", + "since": 20, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false } ] } -- Gitee From 0a69960b4bca7080b96f9d84397b3b52b7abad6e Mon Sep 17 00:00:00 2001 From: kangpeng Date: Mon, 2 Jun 2025 11:14:49 +0800 Subject: [PATCH 17/42] =?UTF-8?q?[sheet]sheet=E6=9C=80=E5=B0=8F=E9=AB=98?= =?UTF-8?q?=E5=BA=A6=E5=92=8C=E5=8F=8C=E6=A0=87=E9=A2=98=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=B7=AE=E5=BC=82=E5=8C=96=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: kangpeng --- .../resources/base/element/float_sys.json | 16 +++++++ .../resources/base/element/id_defined.json | 20 ++++++++ .../main/resources/base/element/pattern.json | 12 ++++- .../main/resources/tv/element/color_sys.json | 6 +-- .../main/resources/tv/element/float_sys.json | 48 ++++++++++++++----- 5 files changed, 83 insertions(+), 19 deletions(-) diff --git a/systemres/main/resources/base/element/float_sys.json b/systemres/main/resources/base/element/float_sys.json index 31c262bc..c6463cdc 100644 --- a/systemres/main/resources/base/element/float_sys.json +++ b/systemres/main/resources/base/element/float_sys.json @@ -916,6 +916,22 @@ "name": "sheet_close_icon_title_space", "value": "$float:padding_level4" }, + { + "name": "sheet_subtitle_text_font_size", + "value": "$float:ohos_id_text_size_sub_title3" + }, + { + "name": "sheet_subtitle_text_margin", + "value": "$float:ohos_id_text_margin_vertical" + }, + { + "name": "sheet_operation_area_height_double", + "value": "72.0vp" + }, + { + "name": "sheet_big_window_min_height", + "value": "320.0vp" + }, { "name": "tab_subtab_text_default_size", "value": "$float:ohos_id_text_size_body1" diff --git a/systemres/main/resources/base/element/id_defined.json b/systemres/main/resources/base/element/id_defined.json index fa8b713a..4bf4074c 100644 --- a/systemres/main/resources/base/element/id_defined.json +++ b/systemres/main/resources/base/element/id_defined.json @@ -32941,6 +32941,26 @@ "type": "media", "name": "ic_person_fill", "order": 6541 + }, + { + "type": "float", + "name": "sheet_subtitle_text_font_size", + "order": 6542 + }, + { + "type": "float", + "name": "sheet_subtitle_text_margin", + "order": 6543 + }, + { + "type": "float", + "name": "sheet_operation_area_height_double", + "order": 6544 + }, + { + "type": "float", + "name": "sheet_big_window_min_height", + "order": 6545 } ] } diff --git a/systemres/main/resources/base/element/pattern.json b/systemres/main/resources/base/element/pattern.json index 0cd2a320..533306e0 100644 --- a/systemres/main/resources/base/element/pattern.json +++ b/systemres/main/resources/base/element/pattern.json @@ -8507,7 +8507,7 @@ }, { "name": "subtitle_text_font_size", - "value": "$float:ohos_id_text_size_sub_title3" + "value": "$float:sheet_subtitle_text_font_size" }, { "name": "subtitle_text_font_color", @@ -8515,7 +8515,15 @@ }, { "name": "subtitle_text_margin", - "value": "$float:ohos_id_text_margin_vertical" + "value": "$float:sheet_subtitle_text_margin" + }, + { + "name": "operation_area_height_double", + "value": "$float:sheet_operation_area_height_double" + }, + { + "name": "big_window_min_height", + "value": "$float:sheet_big_window_min_height" }, { "name": "sheet_background_color", diff --git a/systemres/main/resources/tv/element/color_sys.json b/systemres/main/resources/tv/element/color_sys.json index fd45cb98..c19d90c4 100644 --- a/systemres/main/resources/tv/element/color_sys.json +++ b/systemres/main/resources/tv/element/color_sys.json @@ -40,10 +40,6 @@ "name": "slider_color_click_effect", "value": "#26FFFFFF" }, - { - "name": "sheet_panel_background_color", - "value": "#3C3C3C" - }, { "name": "sheet_mask_color", "value": "#CC000000" @@ -465,7 +461,7 @@ "value": "#99000000" }, { - "name": "window_outline_color", + "name": "window_border_color", "value": "#26FFFFFF" }, { diff --git a/systemres/main/resources/tv/element/float_sys.json b/systemres/main/resources/tv/element/float_sys.json index 72a6bce5..127b59d9 100644 --- a/systemres/main/resources/tv/element/float_sys.json +++ b/systemres/main/resources/tv/element/float_sys.json @@ -50,7 +50,7 @@ }, { "name": "sheet_panel_background_blur_style", - "value": "0" + "value": "12" }, { "name": "sheet_height_apply_full_screen", @@ -70,15 +70,15 @@ }, { "name": "sheet_operation_height", - "value": "56.0vp" + "value": "86.0vp" }, { "name": "sheet_title_text_font_size", - "value": "20.0fp" + "value": "32.0fp" }, { "name": "sheet_title_text_horizontal_margin", - "value": "24vp" + "value": "32.0vp" }, { "name": "sheet_title_font_weight", @@ -90,11 +90,27 @@ }, { "name": "sheet_double_title_top_padding", - "value": "16vp" + "value": "26.0vp" }, { "name": "sheet_double_title_bottom_padding", - "value": "2.0vp" + "value": "0.0vp" + }, + { + "name": "sheet_subtitle_text_font_size", + "value": "22.0vp" + }, + { + "name": "sheet_subtitle_text_margin", + "value": "5.0vp" + }, + { + "name": "sheet_operation_area_height_double", + "value": "112.0vp" + }, + { + "name": "sheet_big_window_min_height", + "value": "426.0vp" }, { "name": "popup_border_width", @@ -718,35 +734,43 @@ }, { "name": "window_radius_small", - "value": "16vp" + "value": "32.0vp" }, { "name": "window_outline_width", "value": "0.5vp" }, + { + "name": "window_border_width", + "value": "1.0vp" + }, { "name": "window_shadow_config", "value": "6" }, { "name": "sheet_title_text_margin", - "value": "24vp" + "value": "32.0vp" }, { "name": "window_close_icon_width", - "value": "20vp" + "value": "32.0vp" }, { "name": "sheet_title_area_margin", - "value": "-18vp" + "value": "-16vp" }, { "name": "sheet_close_icon_button_width", - "value": "36.0vp" + "value": "54.0vp" + }, + { + "name": "window_close_radius", + "value": "27.0vp" }, { "name": "sheet_center_default_width", - "value": "420.0vp" + "value": "568.0vp" }, { "name": "sheet_height_default_mode", -- Gitee From 4c0d70ec50035fd830a67cfc0a144b7d83aa11e3 Mon Sep 17 00:00:00 2001 From: limengxi Date: Wed, 4 Jun 2025 18:07:03 +0800 Subject: [PATCH 18/42] resource Signed-off-by: limengxi --- .../resources/base/element/id_defined.json | 15 ++ .../main/resources/base/element/pattern.json | 28 +++ .../main/resources/tv/element/color_sys.json | 10 +- .../main/resources/tv/element/float.json | 10 +- .../main/resources/tv/element/float_sys.json | 88 +++++---- .../main/resources/tv/element/pattern.json | 170 ++++++++++-------- 6 files changed, 206 insertions(+), 115 deletions(-) diff --git a/systemres/main/resources/base/element/id_defined.json b/systemres/main/resources/base/element/id_defined.json index 4bf4074c..6047a3a9 100644 --- a/systemres/main/resources/base/element/id_defined.json +++ b/systemres/main/resources/base/element/id_defined.json @@ -32961,6 +32961,21 @@ "type": "float", "name": "sheet_big_window_min_height", "order": 6545 + }, + { + "type": "float", + "name": "popup_arrow_height", + "order": 6546 + }, + { + "type": "float", + "name": "popup_arrow_width", + "order": 6547 + }, + { + "type": "float", + "name": "dialog_button_border_radius", + "order": 6548 } ] } diff --git a/systemres/main/resources/base/element/pattern.json b/systemres/main/resources/base/element/pattern.json index 533306e0..fc748901 100644 --- a/systemres/main/resources/base/element/pattern.json +++ b/systemres/main/resources/base/element/pattern.json @@ -2548,6 +2548,26 @@ { "name":"common_ok_text", "value":"$string:general_confirm" + }, + { + "name": "dialog_min_button_width", + "value": "104.0vp" + }, + { + "name": "dialog_max_button_width", + "value": "260.0vp" + }, + { + "name": "dialog_button_height", + "value": "0.0vp" + }, + { + "name": "dialog_content_top_padding", + "value": "24.0vp" + }, + { + "name": "dialog_button_border_radius", + "value": "20.0vp" } ] }, @@ -3698,6 +3718,14 @@ { "name": "popup_double_button_is_same_style", "value": "$float:popup_double_button_is_same_style_sys" + }, + { + "name": "popup_arrow_height", + "value": "8.0vp" + }, + { + "name": "popup_arrow_width", + "value": "16.0vp" } ] }, diff --git a/systemres/main/resources/tv/element/color_sys.json b/systemres/main/resources/tv/element/color_sys.json index ecff19d0..fe39aea5 100644 --- a/systemres/main/resources/tv/element/color_sys.json +++ b/systemres/main/resources/tv/element/color_sys.json @@ -54,7 +54,7 @@ }, { "name": "popup_border_color", - "value": "#26000000" + "value": "#1AFFFFFF" }, { "name": "popup_text_primary_color", @@ -254,15 +254,15 @@ }, { "name": "toast_border_color", - "value": "#26FFFFFF" + "value": "#1AFFFFFF" }, { "name": "toast_inner_border_color", - "value": "#26FFFFFF" + "value": "#1AFFFFFF" }, { "name": "toast_container_color", - "value": "#3C3C3C" + "value": "#E62E3033" }, { "name": "toast_color_text_primary_contrary", @@ -270,7 +270,7 @@ }, { "name": "toast_default_bg_color", - "value": "#3C3C3C" + "value": "#E62E3033" }, { "name": "toolBarDialog_container_focus_color", diff --git a/systemres/main/resources/tv/element/float.json b/systemres/main/resources/tv/element/float.json index 1d4a7b17..087c90cc 100644 --- a/systemres/main/resources/tv/element/float.json +++ b/systemres/main/resources/tv/element/float.json @@ -202,7 +202,7 @@ }, { "name": "ohos_id_toast_content_min_height", - "value": "47.0vp" + "value": "64.0vp" }, { "name": "ohos_id_subtab_line_gap", @@ -278,11 +278,11 @@ }, { "name": "toast_padding_level8", - "value": "24.0vp" + "value": "22.0vp" }, { "name": "toast_padding_level4", - "value": "12.0vp" + "value": "10.0vp" }, { "name": "toast_default_shadow_style", @@ -351,6 +351,10 @@ { "name": "Caption_M", "value": "14.0fp" + }, + { + "name": "menu_item_group_title_text_font_size_token", + "value": "18.0vp" } ] } \ No newline at end of file diff --git a/systemres/main/resources/tv/element/float_sys.json b/systemres/main/resources/tv/element/float_sys.json index cf8f4562..5bef4b2e 100644 --- a/systemres/main/resources/tv/element/float_sys.json +++ b/systemres/main/resources/tv/element/float_sys.json @@ -38,16 +38,12 @@ }, { "name": "dialog_background_blur_style", - "value": "0" + "value": "12" }, { "name": "toast_panel_background_blur_style", "value": "0" }, - { - "name": "toast_background_blur_style", - "value": "0" - }, { "name": "sheet_panel_background_blur_style", "value": "12" @@ -114,23 +110,23 @@ }, { "name": "popup_border_width", - "value": "0.5vp" + "value": "0.0vp" }, { "name": "popup_target_space", - "value": "12.0vp" + "value": "16.0vp" }, { "name": "popup_corner_radius", - "value": "12.0vp" + "value": "16.0vp" }, { "name": "popup_min_height", - "value": "36.0vp" + "value": "64.0vp" }, { "name": "bubble_min_mum_height", - "value": "36.0vp" + "value": "64.0vp" }, { "name": "popup_max_columns", @@ -138,15 +134,15 @@ }, { "name": "popup_horizontal_padding", - "value": "12.0vp" + "value": "16.0vp" }, { "name": "popup_vertical_padding", - "value": "8.0vp" + "value": "17.0vp" }, { "name": "popup_text_font_size", - "value": "14.0fp" + "value": "22.0fp" }, { "name": "popup_container_theme_color_mode", @@ -394,11 +390,11 @@ }, { "name": "toast_border_width", - "value": "0.0" + "value": "1.0vp" }, { "name": "toast_inner_border_width", - "value": "2.0" + "value": "1.0vp" }, { "name": "toast_shadow_default", @@ -410,35 +406,35 @@ }, { "name": "toast_padding_vertical_api_twelve", - "value": "12.0vp" + "value": "16vp" }, { "name": "toast_padding_horizontal_api_twelve", - "value": "24.0vp" + "value": "22.0vp" }, { "name": "toast_padding_horizontal", - "value": "24.0vp" + "value": "22.0vp" }, { "name": "toast_padding_vertical", - "value": "12.0vp" + "value": "16vp" }, { "name": "toast_border_radius_level9", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "toast_border_radius", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "toast_Body_M", - "value": "16.0fp" + "value": "22.0fp" }, { "name": "toast_text_font_size", - "value": "16.0fp" + "value": "22.0fp" }, { "name": "toast_bg_theme_color_mode", @@ -634,11 +630,11 @@ }, { "name": "alert_title_padding_bottom", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "alert_button_top_padding", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "dialog_subtitle_font_size", @@ -652,6 +648,10 @@ "name": "dialog_tip_image_size", "value": "70.0vp" }, + { + "name": "alertdialog_title_padding_top", + "value": "32.0vp" + }, { "name": "dialog_tip_text_top_padding", "value": "24.0vp" @@ -682,11 +682,11 @@ }, { "name": "alert_button_horizontal_space", - "value": "12.0vp" + "value": "32.0vp" }, { "name": "alert_button_vertical_space", - "value": "12.0vp" + "value": "32.0vp" }, { "name": "alert_divider_width", @@ -694,31 +694,31 @@ }, { "name": "alert_button_bottom_padding_horizontal", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "alert_button_bottom_padding_vertical", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "alert_right_padding_horizontal", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "alert_left_padding_horizontal", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "alert_right_padding_vertical", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "alert_left_padding_vertical", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "alert_title_padding_top", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "dialog_checkbox_min_height", @@ -788,6 +788,26 @@ "name": "ohos_id_progress_button_download_height", "value": "40.0vp" }, + { + "name": "alertdialog_normal_button_text_font_size", + "value": "24.0fp" + }, + { + "name": "button_container_border_radius_small", + "value": "$float:corner_radius_level10" + }, + { + "name": "button_container_border_radius_normal", + "value": "27.0vp" + }, + { + "name": "menu_item_vertical_padding_token", + "value": "16.0vp" + }, + { + "name": "menu_border_radius_token", + "value": "$float:corner_radius_level16" + }, { "name": "alpha_primary", "value": "0.9" diff --git a/systemres/main/resources/tv/element/pattern.json b/systemres/main/resources/tv/element/pattern.json index a7661b8f..53f5df65 100644 --- a/systemres/main/resources/tv/element/pattern.json +++ b/systemres/main/resources/tv/element/pattern.json @@ -69,7 +69,7 @@ }, { "name": "button_radius", - "value": "20.0vp" + "value": "27.0vp" }, { "name": "button_bg_color", @@ -89,7 +89,7 @@ }, { "name": "button_font_size", - "value": "18.0fp" + "value": "24.0fp" }, { "name": "button_font_weight", @@ -97,11 +97,11 @@ }, { "name": "button_min_width", - "value": "1.0vp" + "value": "165.0vp" }, { "name": "button_height", - "value": "40.0vp" + "value": "54.0vp" }, { "name": "button_download_height", @@ -109,11 +109,11 @@ }, { "name": "button_horizontal_padding", - "value": "12.0vp" + "value": "16.0vp" }, { "name": "button_vertical_padding", - "value": "$float:ohos_id_button_vertical_padding" + "value": "11.0vp" }, { "name": "button_min_font_size", @@ -165,7 +165,7 @@ }, { "name": "small_button_horizontal_padding", - "value": "12.0vp" + "value": "16.0vp" }, { "name": "bg_color_normal", @@ -177,11 +177,11 @@ }, { "name": "small_button_font_size", - "value": "14.0fp" + "value": "18.0fp" }, { "name": "small_button_height", - "value": "28.0vp" + "value": "38.0vp" }, { "name": "role_warning", @@ -189,19 +189,19 @@ }, { "name": "border_width", - "value": "0.5vp" + "value": "1.0vp" }, { "name": "border_color", - "value": "#26FFFFFF" + "value": "#1AFFFFFF" }, { "name": "width_border_small", - "value": "0.5vp" + "value": "1.0vp" }, { "name": "color_border_small", - "value": "#26FFFFFF" + "value": "#1AFFFFFF" }, { "name": "shadow_default", @@ -301,7 +301,7 @@ }, { "name": "text_button_font_size", - "value": "16.0fp" + "value": "22.0fp" }, { "name": "apply_text_font_size", @@ -870,15 +870,15 @@ "value": [ { "name": "radius", - "value": "16.0vp" + "value": "32.0vp" }, { "name": "dialog_container_radius", - "value": "16.0vp" + "value": "32.0vp" }, { "name": "bg_color", - "value": "#3C3C3C" + "value": "#E62E3033" }, { "name": "bg_color_version_twelve", @@ -886,7 +886,7 @@ }, { "name": "dialog_container_max_width", - "value": "346vp" + "value": "460.0vp" }, { "name": "dialog_container_margin_left", @@ -914,15 +914,15 @@ }, { "name": "title_text_font_size", - "value": "$float:ohos_id_text_size_dialog_tittle" + "value": "32.0fp" }, { "name": "title_text_font_size_min", - "value": "24.0vp" + "value": "32.0fp" }, { "name": "content_text_font_size_min", - "value": "$float:ohos_id_text_size_body1" + "value": "22.0fp" }, { "name": "content_text_color", @@ -930,11 +930,11 @@ }, { "name": "content_text_font_size", - "value": "16.0fp" + "value": "22.0fp" }, { "name": "button_bg_color", - "value": "#3C3C3C" + "value": "#1AFFFFFF" }, { "name": "button_bg_color_clicked", @@ -942,7 +942,7 @@ }, { "name": "common_button_bg_color", - "value": "$color:ohos_id_color_button_normal" + "value": "#1AFFFFFF" }, { "name": "first_button_bg_color", @@ -954,7 +954,7 @@ }, { "name": "button_text_font_size", - "value": "$float:ohos_id_text_size_button1" + "value": "22.0fp" }, { "name": "dialog_divider_length", @@ -966,7 +966,7 @@ }, { "name": "default_padding_bottom_fixed", - "value": "24.0vp" + "value": "8.0vp" }, { "name": "default_dialog_margin_bottom", @@ -982,7 +982,7 @@ }, { "name": "subtitle_text_font_size", - "value": "$float:ohos_id_text_size_body2" + "value": "22.0fp" }, { "name": "attribute_alpha_content_primary", @@ -998,31 +998,31 @@ }, { "name": "button_padding_bottom", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "single_button_padding_start", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "single_button_padding_end", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "muti_button_padding_start", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "muti_button_padding_end", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "muti_button_padding_horizontal", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "muti_button_padding_vertical", - "value": "12.0vp" + "value": "16.0vp" }, { "name": "button_default_bg_color", @@ -1038,7 +1038,7 @@ }, { "name": "dialog_button_spacing_vertical", - "value": "8.0vp" + "value": "11.0vp" }, { "name": "dialog_frame_start", @@ -1130,35 +1130,35 @@ }, { "name": "dialog_padding_left", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "dialog_padding_top", - "value": "24.0vp" + "value": "16.0vp" }, { "name": "dialog_padding_right", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "dialog_padding_bottom", - "value": "24.0vp" + "value": "16.0vp" }, { "name": "dialog_padding_left_adjust", - "value": "24.0vp" + "value": "30.0vp" }, { "name": "dialog_padding_top_adjust", - "value": "24.0vp" + "value": "0.0vp" }, { "name": "dialog_padding_right_adjust", - "value": "24.0vp" + "value": "30.0vp" }, { "name": "dialog_padding_bottom_adjust", - "value": "$float:ohos_id_dialog_padding_bottom_adjust" + "value": "0.0vp" }, { "name": "button_color_clicked", @@ -1166,7 +1166,7 @@ }, { "name": "button_title_padding_vertical", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "dialog_title_text_max_lines", @@ -1186,7 +1186,7 @@ }, { "name": "dialog_buttonwithcontent_padding", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "dialog_alignment", @@ -1266,7 +1266,7 @@ }, { "name": "padding_top_title", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "button_type", @@ -1274,11 +1274,11 @@ }, { "name": "normal_button_text_font_size", - "value": "18.0fp" + "value": "24.0fp" }, { "name": "padding_single_title", - "value": "48.0vp" + "value": "64.0vp" }, { "name": "color_bg_with_blur", @@ -1290,7 +1290,7 @@ }, { "name": "dialog_ratio_height", - "value": "0.8" + "value": "1" }, { "name": "border_color", @@ -1298,7 +1298,7 @@ }, { "name": "border_width", - "value": "0.5vp" + "value": "1vp" }, { "name": "text_align_title", @@ -1315,6 +1315,26 @@ { "name": "common_ok_text", "value": "$string:general_confirm" + }, + { + "name": "dialog_min_button_width", + "value": "182.0vp" + }, + { + "name": "dialog_max_button_width", + "value": "396.0vp" + }, + { + "name": "dialog_button_height", + "value": "54.0vp" + }, + { + "name": "dialog_content_top_padding", + "value": "32.0vp" + }, + { + "name": "dialog_button_border_radius", + "value": "32.0vp" } ] }, @@ -1524,6 +1544,14 @@ { "name": "popup_double_button_is_same_style", "value": "$float:popup_double_button_is_same_style_sys" + }, + { + "name": "popup_arrow_height", + "value": "10.0vp" + }, + { + "name": "popup_arrow_width", + "value": "22.0vp" } ] }, @@ -2355,7 +2383,7 @@ "value": [ { "name": "bg_color", - "value": "#3C3C3C" + "value": "#E62E3033" }, { "name": "bg_color_select_button", @@ -2403,7 +2431,7 @@ }, { "name": "menu_border_width", - "value": "0.5vp" + "value": "1.0vp" }, { "name": "menu_border_color", @@ -2415,15 +2443,15 @@ }, { "name": "menu_item_left_right_margin", - "value": "6.0vp" + "value": "1.0vp" }, { "name": "menu_target_security_space", - "value": "24.0vp" + "value": "16.0vp" }, { "name": "menu_item_content_align", - "value": "1.0" + "value": "4.0" }, { "name": "menu_item_focused_bg_color", @@ -2439,11 +2467,11 @@ }, { "name": "menu_text_font_size", - "value": "20.0fp" + "value": "24.0fp" }, { "name": "menu_title_text_font_size", - "value": "24.0vp" + "value": "26.0fp" }, { "name": "border_radius", @@ -2451,7 +2479,7 @@ }, { "name": "menu_border_radius", - "value": "24.0vp" + "value": "32.0vp" }, { "name": "inner_border_radius", @@ -2499,7 +2527,7 @@ }, { "name": "icon_content_padding", - "value": "0.0vp" + "value": "10.0vp" }, { "name": "divider_padding_vertical", @@ -2551,7 +2579,7 @@ }, { "name": "default_divider_width", - "value": "1.0px" + "value": "1.0vp" }, { "name": "select_min_width", @@ -2745,10 +2773,6 @@ "name": "menu_double_border_enable", "value": "$string:ohos_id_menu_double_border_enable_default" }, - { - "name": "menu_item_child_min_height", - "value": "40vp" - }, { "name": "menu_item_vertical_padding", "value": "$float:menu_item_vertical_padding_token" @@ -2763,7 +2787,7 @@ }, { "name": "inner_border_radius_new", - "value": "12.0vp" + "value": "16.0vp" }, { "name": "menu_text_color", @@ -2771,7 +2795,7 @@ }, { "name": "menu_outer_border_width", - "value": "$float:ohos_id_menu_outer_border_width" + "value": "0.0vp" }, { "name": "menu_outer_border_radius", @@ -2783,7 +2807,7 @@ }, { "name": "menu_inner_border_width", - "value": "$float:ohos_id_menu_inner_border_width" + "value": "0.0vp" }, { "name": "menu_inner_border_radius", @@ -2839,11 +2863,11 @@ }, { "name": "menu_divider_start_margin", - "value": "12.0vp" + "value": "16.0vp" }, { "name": "menu_divider_end_margin", - "value": "12.0vp" + "value": "16.0vp" }, { "name": "menu_focus_style_type", @@ -2887,15 +2911,15 @@ }, { "name": "menu_normal_border_width", - "value": "$float:menu_normal_border_width" + "value": "0.0vp" }, { "name": "menu_normal_border_color", - "value": "#26FFFFFF" + "value": "#1AFFFFFF" }, { "name": "menu_normal_back_ground_blur_type", - "value": "0.0" + "value": "12.0" }, { "name": "option_normal_top_bottom_margin", @@ -2979,7 +3003,7 @@ }, { "name": "menu_padding_interval", - "value": "10.0vp" + "value": "16.0vp" }, { "name": "menu_haptic_feedback", -- Gitee From 1f3c7ebf1a1cf9bbaacceb40993f175cf78f0d70 Mon Sep 17 00:00:00 2001 From: duansizhao Date: Wed, 4 Jun 2025 11:38:00 +0800 Subject: [PATCH 19/42] =?UTF-8?q?=E6=96=B0=E5=A2=9EGRANT=5FURI=5FPERMISSIO?= =?UTF-8?q?N=5FAS=5FCALLER=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: duansizhao --- systemres/main/module.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/systemres/main/module.json b/systemres/main/module.json index 87048cd9..dab6f77b 100644 --- a/systemres/main/module.json +++ b/systemres/main/module.json @@ -5605,6 +5605,15 @@ "provisionEnable": true, "distributedSceneEnable": false }, + { + "name": "ohos.permission.GRANT_URI_PERMISSION_AS_CALLER", + "grantMode": "system_grant", + "availableLevel": "system_core", + "since": 20, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false + }, { "name": "ohos.permission.ACCESS_FIDO2_ONLINEAUTH", "grantMode": "system_grant", -- Gitee From fce9961bad35f6fc77f82108e9902a86506246f6 Mon Sep 17 00:00:00 2001 From: gaojiaqi Date: Thu, 5 Jun 2025 10:04:21 +0800 Subject: [PATCH 20/42] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gaojiaqi --- systemres/main/module.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/systemres/main/module.json b/systemres/main/module.json index 91471bee..9c3de7d4 100644 --- a/systemres/main/module.json +++ b/systemres/main/module.json @@ -5614,6 +5614,15 @@ "provisionEnable": false, "distributedSceneEnable": false }, + { + "name": "ohos.permission.BACKGROUND_MANAGER_POWER_SAVE_MODE", + "grantMode": "system_grant", + "availableLevel": "normal", + "since": 20, + "deprecated": "", + "provisionEnable": false, + "distributedSceneEnable": false + }, { "name": "ohos.permission.PUBLISH_FORM_CROSS_BUNDLE", "grantMode": "system_grant", -- Gitee From 3091f0013cf157a8736c0194df0b94ea8560d35e Mon Sep 17 00:00:00 2001 From: liuhui <396604715@qq.com> Date: Thu, 5 Jun 2025 10:32:07 +0800 Subject: [PATCH 21/42] =?UTF-8?q?token=E5=8F=82=E6=95=B0color=E3=80=81floa?= =?UTF-8?q?t=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liuhui <396604715@qq.com> --- systemres/main/resources/base/element/color.json | 4 ++++ systemres/main/resources/base/element/id_defined.json | 5 +++++ systemres/main/resources/wearable/element/color.json | 4 ++++ systemres/main/resources/wearable/element/color_sys.json | 4 ++-- systemres/main/resources/wearable/element/float.json | 4 ++++ 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/systemres/main/resources/base/element/color.json b/systemres/main/resources/base/element/color.json index e8c9c02f..9fd4accf 100644 --- a/systemres/main/resources/base/element/color.json +++ b/systemres/main/resources/base/element/color.json @@ -1627,6 +1627,10 @@ { "name": "ai_intelligent_gradient_color4", "value": "#FFED692E" + }, + { + "name": "comp_background_float", + "value": "#262626" } ] } diff --git a/systemres/main/resources/base/element/id_defined.json b/systemres/main/resources/base/element/id_defined.json index 6047a3a9..7411bc42 100644 --- a/systemres/main/resources/base/element/id_defined.json +++ b/systemres/main/resources/base/element/id_defined.json @@ -32976,6 +32976,11 @@ "type": "float", "name": "dialog_button_border_radius", "order": 6548 + }, + { + "type": "color", + "name": "comp_background_float", + "order": 6549 } ] } diff --git a/systemres/main/resources/wearable/element/color.json b/systemres/main/resources/wearable/element/color.json index 27d035f6..d6d9210e 100644 --- a/systemres/main/resources/wearable/element/color.json +++ b/systemres/main/resources/wearable/element/color.json @@ -459,6 +459,10 @@ { "name": "ohos_id_blur_style_component_ultra_thick_color", "value": "#A9404040" + }, + { + "name": "comp_background_float", + "value": "#262626" } ] } diff --git a/systemres/main/resources/wearable/element/color_sys.json b/systemres/main/resources/wearable/element/color_sys.json index 5d4d4db8..1e2539d2 100755 --- a/systemres/main/resources/wearable/element/color_sys.json +++ b/systemres/main/resources/wearable/element/color_sys.json @@ -110,7 +110,7 @@ }, { "name": "comp_emphasize_secondary", - "value": "#335EA1FF" + "value": "#3F5EA1FF" }, { "name": "comp_emphasize_tertiary", @@ -246,7 +246,7 @@ }, { "name": "comp_background_warning_secondary", - "value": "#FDD9D9" + "value": "#3FE84026" }, { "name": "button_background_color_transparent", diff --git a/systemres/main/resources/wearable/element/float.json b/systemres/main/resources/wearable/element/float.json index 19060c33..e5038586 100644 --- a/systemres/main/resources/wearable/element/float.json +++ b/systemres/main/resources/wearable/element/float.json @@ -411,6 +411,10 @@ { "name": "refresh_over_edge_following_ratio_api_twenty", "value": "10.0" + }, + { + "name": "alpha_60", + "value": "0.66" } ] } -- Gitee From 64cb2d2a4870a28af9fc505a45a1ce35d80e408e Mon Sep 17 00:00:00 2001 From: Yang-Kaka Date: Thu, 5 Jun 2025 07:16:31 +0000 Subject: [PATCH 22/42] add hand permission Signed-off-by: Yang-Kaka --- systemres/main/module.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/systemres/main/module.json b/systemres/main/module.json index 91471bee..fb0f592b 100644 --- a/systemres/main/module.json +++ b/systemres/main/module.json @@ -5622,6 +5622,15 @@ "deprecated": "", "provisionEnable": true, "distributedSceneEnable": false + }, + { + "name": "ohos.permission.DETECT_GESTURE", + "grantMode": "system_grant", + "availableLevel": "normal", + "since": 20, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false } ] } -- Gitee From cf8c3d3aaa142956a2a1010c8dcf4126e9d762e7 Mon Sep 17 00:00:00 2001 From: xiangyuan Date: Thu, 5 Jun 2025 16:21:14 +0800 Subject: [PATCH 23/42] =?UTF-8?q?add=20menu=20UX=20=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xiangyuan --- systemres/main/resources/base/element/pattern.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/systemres/main/resources/base/element/pattern.json b/systemres/main/resources/base/element/pattern.json index fc748901..fd0dd64e 100644 --- a/systemres/main/resources/base/element/pattern.json +++ b/systemres/main/resources/base/element/pattern.json @@ -5905,6 +5905,10 @@ { "name": "general_ai_preview_menu_display_failed_font_color", "value": "$color:font_secondary" + }, + { + "name": "text_overlay_text_font_size", + "value": "$float:Body_M" } ] }, -- Gitee From 0578c23c1a84d1c8d7d2aa5f7cf453bd9e672241 Mon Sep 17 00:00:00 2001 From: "@ran-zhao-yu" Date: Thu, 5 Jun 2025 15:04:36 +0800 Subject: [PATCH 24/42] =?UTF-8?q?=E6=96=B0=E5=A2=9Enotdef=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: @ran-zhao-yu --- fonts/HarmonyOS_Sans_Notdef.ttf | Bin 0 -> 1504 bytes systemres.gni | 6 ++++++ 2 files changed, 6 insertions(+) create mode 100644 fonts/HarmonyOS_Sans_Notdef.ttf diff --git a/fonts/HarmonyOS_Sans_Notdef.ttf b/fonts/HarmonyOS_Sans_Notdef.ttf new file mode 100644 index 0000000000000000000000000000000000000000..35cf43cacb32378be20e5216146a44c8d10eba7e GIT binary patch literal 1504 zcmb7E&1)M+9DOspw&glsuG?UT5GKT=ML4P~oSu4ca4-sSY$6fkLW#OaqmLqKg?42} zrO@1xw1ngk$jRUyiw%JU(o3PuC1?KuCKo%9Lm(8~OTkv&tOnB-LF-v&=e_s)nBQ-P zT?hal;5Hnnh3sdkw;zptOJ#%e>wL{?;0#^@;t2UtsoE|+*%+B8FOa9p+AGAvpV!Ha z|L0{213$XQ$al!c%eC;9^G1vTGDhxJ{k&&%a+A-kdAAzq$1wQ`a#iXxAw;6)4dh>jO*6kHF>XFuPhcv z@2oH9j(_nd9OsRxU^{hp#;iNjD??&z{|~w8D$>DjeMIcQS?jQVa~on*Zrbi>vO{$5 ziFaeV6*vJmvKaR7@gZIv#81=M^%3|O(-up1dBb7{=kS%qE`7eYxDQA1$l`wLKUo~( z`8>CHkoCMUH{cF(pWAqCu|QmCizSYU2NpY+6{{Az^x3w!52xf&i~A9mpI98jNqODk zL8N7A#&5Knl~OrWsbp&M0$&$Zy5+6tin^?qD|xME{KSNs3kwN#sajPT;~S`q4s>%_ z7ZPc&S@Y}dg{;bY^+3)0VL=x&y40$A&7L;3sGC8>ud7sIDw*u*(%U0vHpq21NPG2m zMa}y4Fz8*ZIA~R`L z*kV=_@&Dr#7NZ>lR$_KB{UtEP9+QX2a+n;sgAQ{4=)lx$x-=&^8`ToB%fp Date: Fri, 6 Jun 2025 01:06:45 +0000 Subject: [PATCH 25/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Yang-Kaka --- systemres/main/module.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systemres/main/module.json b/systemres/main/module.json index fb0f592b..2530d0b5 100644 --- a/systemres/main/module.json +++ b/systemres/main/module.json @@ -5629,7 +5629,7 @@ "availableLevel": "normal", "since": 20, "deprecated": "", - "provisionEnable": true, + "provisionEnable": false, "distributedSceneEnable": false } ] -- Gitee From a609bf913fc3911913580463abd053b83863273e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=91=E6=96=B9=E9=91=AB?= Date: Sat, 7 Jun 2025 11:00:02 +0000 Subject: [PATCH 26/42] =?UTF-8?q?=E6=96=B0=E5=A2=9EVIRUS=5FPROTECTION=5FSE?= =?UTF-8?q?RVICES=E3=80=81UPLOAD=5FSAMPLE=5FFILE=E3=80=81DOWNLOAD=5FPOLICY?= =?UTF-8?q?=5FFILE=E3=80=81NOTIFY=5FVIRUS=5FPROTECTION=E7=AD=89=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 金方鑫 --- systemres/main/module.json | 45 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/systemres/main/module.json b/systemres/main/module.json index a5d6322b..2481100c 100644 --- a/systemres/main/module.json +++ b/systemres/main/module.json @@ -5632,6 +5632,51 @@ "provisionEnable": true, "distributedSceneEnable": false }, + { + "name": "ohos.permission.VIRUS_PROTECTION_SERVICE", + "grantMode": "system_grant", + "availableLevel": "system_basic", + "since": 20, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false + }, + { + "name": "ohos.permission.UPLOAD_SAMPLE_FILE", + "grantMode": "system_grant", + "availableLevel": "system_basic", + "since": 20, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false + }, + { + "name": "ohos.permission.DOWNLOAD_POLICY_FILE", + "grantMode": "system_grant", + "availableLevel": "system_basic", + "since": 20, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false + }, + { + "name": "ohos.permission.NOTIFY_VIRUS_PROTECTION", + "grantMode": "system_grant", + "availableLevel": "system_basic", + "since": 20, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false + }, + { + "name": "ohos.permission.ACCESS_VIRUS_PROTECTION", + "grantMode": "system_grant", + "availableLevel": "system_basic", + "since": 20, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false + }, { "name": "ohos.permission.DETECT_GESTURE", "grantMode": "system_grant", -- Gitee From cf2284af60fcac0fda78936dc4448a674e16813e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=B7=83=E8=80=80?= Date: Tue, 10 Jun 2025 09:38:55 +0800 Subject: [PATCH 27/42] =?UTF-8?q?=E6=96=B0=E5=A2=9Efido2=20privilege?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张跃耀 --- systemres/main/module.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/systemres/main/module.json b/systemres/main/module.json index 6aac90fc..de77ef42 100644 --- a/systemres/main/module.json +++ b/systemres/main/module.json @@ -5632,6 +5632,15 @@ "provisionEnable": true, "distributedSceneEnable": false }, + { + "name": "ohos.permission.ACCESS_FIDO2_ONLINEAUTH_PRIVILEGE", + "grantMode": "system_grant", + "availableLevel": "system_basic", + "since": 20, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false + }, { "name": "ohos.permission.BACKGROUND_MANAGER_POWER_SAVE_MODE", "grantMode": "system_grant", -- Gitee From f84406a3bae554d4502a63cecb170910396c841e Mon Sep 17 00:00:00 2001 From: small_leek Date: Thu, 5 Jun 2025 20:29:35 +0800 Subject: [PATCH 28/42] add ohos.permission.SUPPORT_INSTALL_ON_U1 Signed-off-by: small_leek --- systemres/main/module.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/systemres/main/module.json b/systemres/main/module.json index c599c217..e2506b16 100644 --- a/systemres/main/module.json +++ b/systemres/main/module.json @@ -5605,6 +5605,15 @@ "provisionEnable": true, "distributedSceneEnable": false }, + { + "name": "ohos.permission.SUPPORT_INSTALL_ON_U1", + "grantMode": "system_grant", + "availableLevel": "system_basic", + "since": 20, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false + }, { "name": "ohos.permission.GRANT_URI_PERMISSION_AS_CALLER", "grantMode": "system_grant", -- Gitee From fa51e52fcc7dd574c4ff94962f8cf50c366fbd61 Mon Sep 17 00:00:00 2001 From: yuanchen13 Date: Tue, 10 Jun 2025 14:18:36 +0800 Subject: [PATCH 29/42] eap auth Signed-off-by: chensong60 --- systemres/main/module.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/systemres/main/module.json b/systemres/main/module.json index b5ba50e9..9e4a9d3a 100644 --- a/systemres/main/module.json +++ b/systemres/main/module.json @@ -1188,6 +1188,15 @@ "provisionEnable": true, "distributedSceneEnable": false }, + { + "name": "ohos.permission.ENTERPRISE_MANAGE_EAP", + "grantMode": "system_grant", + "availableLevel": "system_basic", + "since": 20, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false + }, { "name": "ohos.permission.MANAGE_NET_STRATEGY", "grantMode": "system_grant", -- Gitee From 8f94793513c67c533ef6f4bf7979466c649f1178 Mon Sep 17 00:00:00 2001 From: zhanghang Date: Tue, 10 Jun 2025 23:06:05 +0800 Subject: [PATCH 30/42] fix_text_token Signed-off-by: zhanghang --- systemres/main/resources/2in1/element/float.json | 4 ---- systemres/main/resources/2in1/element/float_sys.json | 2 +- systemres/main/resources/base/element/float.json | 8 ++++++++ systemres/main/resources/base/element/id_defined.json | 10 ++++++++++ systemres/main/resources/base/element/pattern.json | 4 ++-- systemres/main/resources/tv/element/float.json | 4 ++-- systemres/main/resources/wearable/element/float.json | 8 ++++---- 7 files changed, 27 insertions(+), 13 deletions(-) diff --git a/systemres/main/resources/2in1/element/float.json b/systemres/main/resources/2in1/element/float.json index 332b5eb7..c87e0955 100644 --- a/systemres/main/resources/2in1/element/float.json +++ b/systemres/main/resources/2in1/element/float.json @@ -359,10 +359,6 @@ { "name": "text_overlay_menu_enable", "value": "1.0" - }, - { - "name": "corner_radius_level10", - "value": "8.0vp" } ] } \ No newline at end of file diff --git a/systemres/main/resources/2in1/element/float_sys.json b/systemres/main/resources/2in1/element/float_sys.json index 0f3d72f7..95182dca 100644 --- a/systemres/main/resources/2in1/element/float_sys.json +++ b/systemres/main/resources/2in1/element/float_sys.json @@ -174,7 +174,7 @@ }, { "name": "textfield_border_radius", - "value": "8.0vp" + "value": "corner_radius_level4" }, { "name": "menu_animation_duration", diff --git a/systemres/main/resources/base/element/float.json b/systemres/main/resources/base/element/float.json index b3b7d872..2fbcf37f 100644 --- a/systemres/main/resources/base/element/float.json +++ b/systemres/main/resources/base/element/float.json @@ -4067,6 +4067,14 @@ { "name": "select_check_mark_font_weight", "value": "14.0" + }, + { + "name": "textfield_container_border_radius_size", + "value": "corner_radius_level6" + }, + { + "name": "textfield_container_padding_horizontal", + "value": "padding_level8" } ] } diff --git a/systemres/main/resources/base/element/id_defined.json b/systemres/main/resources/base/element/id_defined.json index 7411bc42..5f61e822 100644 --- a/systemres/main/resources/base/element/id_defined.json +++ b/systemres/main/resources/base/element/id_defined.json @@ -32981,6 +32981,16 @@ "type": "color", "name": "comp_background_float", "order": 6549 + }, + { + "type": "float", + "name": "textfield_container_border_radius_size", + "order": 6550 + }, + { + "type": "float", + "name": "textfield_container_padding_horizontal", + "order": 6551 } ] } diff --git a/systemres/main/resources/base/element/pattern.json b/systemres/main/resources/base/element/pattern.json index fd0dd64e..fed9bc1e 100644 --- a/systemres/main/resources/base/element/pattern.json +++ b/systemres/main/resources/base/element/pattern.json @@ -5299,7 +5299,7 @@ }, { "name": "border_radius_size", - "value": "$float:corner_radius_level6" + "value": "$float:textfield_container_border_radius_size" }, { "name": "typing_text_color", @@ -5379,7 +5379,7 @@ }, { "name": "textfield_padding_horizontal", - "value": "$float:padding_level8" + "value": "$float:textfield_container_padding_horizontal" }, { "name": "textfield_underline_padding_horizontal", diff --git a/systemres/main/resources/tv/element/float.json b/systemres/main/resources/tv/element/float.json index 087c90cc..3dd31795 100644 --- a/systemres/main/resources/tv/element/float.json +++ b/systemres/main/resources/tv/element/float.json @@ -189,8 +189,8 @@ "value": "8.0vp" }, { - "name": "corner_radius_level6", - "value": "8.0vp" + "name": "textfield_container_border_radius_size", + "value": "corner_radius_level4" }, { "name": "ohos_id_corner_radius_default_xs", diff --git a/systemres/main/resources/wearable/element/float.json b/systemres/main/resources/wearable/element/float.json index e5038586..fe1f0a17 100644 --- a/systemres/main/resources/wearable/element/float.json +++ b/systemres/main/resources/wearable/element/float.json @@ -397,12 +397,12 @@ "value": "0.0" }, { - "name": "corner_radius_level10", - "value": "22.0vp" + "name": "textfield_border_radius", + "value": "corner_radius_level11" }, { - "name": "padding_level8", - "value": "10.0vp" + "name": "textfield_container_padding_horizontal", + "value": "padding_level5" }, { "name": "scroll_able_over_edge_following_ratio_api_twenty", -- Gitee From 5b51efb05b453eeb4b951b7727100720f307401c Mon Sep 17 00:00:00 2001 From: kangpeng Date: Wed, 11 Jun 2025 16:59:21 +0800 Subject: [PATCH 31/42] =?UTF-8?q?[chip]=20tv=E4=B8=8Achips=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E5=B7=AE=E5=BC=82=E5=8C=96=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: kangpeng --- systemres/main/resources/tv/element/float_sys.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/systemres/main/resources/tv/element/float_sys.json b/systemres/main/resources/tv/element/float_sys.json index 5bef4b2e..f311d794 100644 --- a/systemres/main/resources/tv/element/float_sys.json +++ b/systemres/main/resources/tv/element/float_sys.json @@ -46,7 +46,7 @@ }, { "name": "sheet_panel_background_blur_style", - "value": "12" + "value": "0" }, { "name": "sheet_height_apply_full_screen", @@ -498,11 +498,11 @@ }, { "name": "chip_normal_height", - "value": "40.0vp" + "value": "37.0vp" }, { "name": "chip_small_height", - "value": "28.0vp" + "value": "25.0vp" }, { "name": "chip_show_close_icon_margin", @@ -530,11 +530,11 @@ }, { "name": "chip_normal_text_padding", - "value": "12.0vp" + "value": "10.5vp" }, { "name": "chip_small_text_padding", - "value": "12.0vp" + "value": "10.5vp" }, { "name": "chip_normal_shadow_style", -- Gitee From fdae3dfdcd562b75b2a9e49a966f1039e02bd607 Mon Sep 17 00:00:00 2001 From: fanqibing Date: Wed, 11 Jun 2025 23:57:43 +0800 Subject: [PATCH 32/42] add permission ohos.permission.SET_NET_EXT_ATTRIBUTE Signed-off-by: fanqibing --- systemres/main/module.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/systemres/main/module.json b/systemres/main/module.json index 9d27e114..5e44ae78 100644 --- a/systemres/main/module.json +++ b/systemres/main/module.json @@ -5721,6 +5721,15 @@ "deprecated": "", "provisionEnable": false, "distributedSceneEnable": false + }, + { + "name": "ohos.permission.SET_NET_EXT_ATTRIBUTE", + "grantMode": "system_grant", + "availableLevel": "system_basic", + "since": 20, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false } ] } -- Gitee From bbc95ae3a5bf6a49fd4b3ae66cd8d8e554befafb Mon Sep 17 00:00:00 2001 From: lvchao Date: Thu, 12 Jun 2025 10:37:10 +0800 Subject: [PATCH 33/42] feat:add ohos.permission.THEME_SKIN Signed-off-by: lvchao --- systemres/main/module.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/systemres/main/module.json b/systemres/main/module.json index 9d27e114..e6c3e0f5 100644 --- a/systemres/main/module.json +++ b/systemres/main/module.json @@ -5721,6 +5721,15 @@ "deprecated": "", "provisionEnable": false, "distributedSceneEnable": false + }, + { + "name": "ohos.permission.THEME_SKIN", + "grantMode": "system_grant", + "availableLevel": "system_basic", + "since": 20, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false } ] } -- Gitee From 7fa68fd340711a32e850fd5f6e6cdf02b85346c1 Mon Sep 17 00:00:00 2001 From: zhanghang Date: Thu, 12 Jun 2025 15:57:39 +0800 Subject: [PATCH 34/42] fix_token Signed-off-by: zhanghang --- systemres/main/resources/2in1/element/float_sys.json | 2 +- systemres/main/resources/base/element/float.json | 4 ++-- systemres/main/resources/tv/element/float.json | 2 +- systemres/main/resources/wearable/element/float.json | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/systemres/main/resources/2in1/element/float_sys.json b/systemres/main/resources/2in1/element/float_sys.json index 95182dca..18a04709 100644 --- a/systemres/main/resources/2in1/element/float_sys.json +++ b/systemres/main/resources/2in1/element/float_sys.json @@ -174,7 +174,7 @@ }, { "name": "textfield_border_radius", - "value": "corner_radius_level4" + "value": "$float:corner_radius_level4" }, { "name": "menu_animation_duration", diff --git a/systemres/main/resources/base/element/float.json b/systemres/main/resources/base/element/float.json index 2fbcf37f..354198c3 100644 --- a/systemres/main/resources/base/element/float.json +++ b/systemres/main/resources/base/element/float.json @@ -4070,11 +4070,11 @@ }, { "name": "textfield_container_border_radius_size", - "value": "corner_radius_level6" + "value": "$float:corner_radius_level6" }, { "name": "textfield_container_padding_horizontal", - "value": "padding_level8" + "value": "$float:padding_level8" } ] } diff --git a/systemres/main/resources/tv/element/float.json b/systemres/main/resources/tv/element/float.json index 3dd31795..08c425ed 100644 --- a/systemres/main/resources/tv/element/float.json +++ b/systemres/main/resources/tv/element/float.json @@ -190,7 +190,7 @@ }, { "name": "textfield_container_border_radius_size", - "value": "corner_radius_level4" + "value": "$float:corner_radius_level4" }, { "name": "ohos_id_corner_radius_default_xs", diff --git a/systemres/main/resources/wearable/element/float.json b/systemres/main/resources/wearable/element/float.json index fe1f0a17..f7238815 100644 --- a/systemres/main/resources/wearable/element/float.json +++ b/systemres/main/resources/wearable/element/float.json @@ -398,11 +398,11 @@ }, { "name": "textfield_border_radius", - "value": "corner_radius_level11" + "value": "$float:corner_radius_level11" }, { "name": "textfield_container_padding_horizontal", - "value": "padding_level5" + "value": "$float:padding_level5" }, { "name": "scroll_able_over_edge_following_ratio_api_twenty", -- Gitee From bbafeabfb1a63f109ce904ceef48161474d40a78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B9=B8=E6=BB=A1=E6=B8=9D?= Date: Fri, 13 Jun 2025 10:42:54 +0800 Subject: [PATCH 35/42] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9D=83=E9=99=90:=20o?= =?UTF-8?q?hos.permission.USE=5FFLOAT=5FBALL=20Signed-off-by:=20EmiyaSakur?= =?UTF-8?q?a=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- systemres/main/module.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/systemres/main/module.json b/systemres/main/module.json index e6c3e0f5..b36cb19b 100644 --- a/systemres/main/module.json +++ b/systemres/main/module.json @@ -5722,6 +5722,15 @@ "provisionEnable": false, "distributedSceneEnable": false }, + { + "name": "ohos.permission.USE_FLOAT_BALL", + "grantMode": "system_grant", + "availableLevel": "system_basic", + "since": 20, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false + }, { "name": "ohos.permission.THEME_SKIN", "grantMode": "system_grant", -- Gitee From 053f3e6bab20d3349f1bc36c6753df838ec92cb7 Mon Sep 17 00:00:00 2001 From: xuyong Date: Fri, 13 Jun 2025 11:05:30 +0800 Subject: [PATCH 36/42] add new permission ohos.permission.ACCESS_DFX_LOG_DIR Signed-off-by: xuyong --- systemres/main/module.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/systemres/main/module.json b/systemres/main/module.json index e6c3e0f5..53e00318 100644 --- a/systemres/main/module.json +++ b/systemres/main/module.json @@ -5730,6 +5730,15 @@ "deprecated": "", "provisionEnable": true, "distributedSceneEnable": false + }, + { + "name": "ohos.permission.ACCESS_DFX_LOG_DIR", + "grantMode": "system_grant", + "availableLevel": "system_basic", + "since": 20, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false } ] } -- Gitee From 9b8493f4d5cc075411013ed29dd8f436630b14c5 Mon Sep 17 00:00:00 2001 From: kangpeng Date: Fri, 13 Jun 2025 19:57:01 +0800 Subject: [PATCH 37/42] =?UTF-8?q?[tv]tv=E5=B7=AE=E5=BC=82=E5=8C=96token?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: kangpeng --- .../main/resources/tv/element/float.json | 56 ------------------- 1 file changed, 56 deletions(-) diff --git a/systemres/main/resources/tv/element/float.json b/systemres/main/resources/tv/element/float.json index 08c425ed..f2ba9524 100644 --- a/systemres/main/resources/tv/element/float.json +++ b/systemres/main/resources/tv/element/float.json @@ -296,62 +296,6 @@ "name": "alpha_40", "value": "0.4" }, - { - "name": "Display_L", - "value": "80.0fp" - }, - { - "name": "Display_M", - "value": "64.0fp" - }, - { - "name": "Display_S", - "value": "54.0fp" - }, - { - "name": "Title_L", - "value": "48.0fp" - }, - { - "name": "Title_M", - "value": "40.0fp" - }, - { - "name": "Title_S", - "value": "32.0fp" - }, - { - "name": "Subtitle_L", - "value": "26.0fp" - }, - { - "name": "Subtitle_M", - "value": "24.0fp" - }, - { - "name": "Subtitle_S", - "value": "22.0fp" - }, - { - "name": "Body_L", - "value": "24.0fp" - }, - { - "name": "Body_M", - "value": "22.0fp" - }, - { - "name": "Body_S", - "value": "18.0fp" - }, - { - "name": "Caption_L", - "value": "16.0fp" - }, - { - "name": "Caption_M", - "value": "14.0fp" - }, { "name": "menu_item_group_title_text_font_size_token", "value": "18.0vp" -- Gitee From 5749ca0006fc51f90e05c0124ea50df8642de89b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=85?= <405160045@qq.com> Date: Sat, 14 Jun 2025 17:57:03 +0800 Subject: [PATCH 38/42] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9D=83=E9=99=90ohos.?= =?UTF-8?q?permission.ACCESS=5FTVCOOPERATION?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 任珅 <405160045@qq.com> --- systemres/main/module.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/systemres/main/module.json b/systemres/main/module.json index 9d27e114..fbd35416 100644 --- a/systemres/main/module.json +++ b/systemres/main/module.json @@ -5713,6 +5713,15 @@ "provisionEnable": true, "distributedSceneEnable": false }, + { + "name": "ohos.permission.ACCESS_TVCOOPERATION", + "grantMode": "system_grant", + "availableLevel": "system_basic", + "since": 20, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false + }, { "name": "ohos.permission.DETECT_GESTURE", "grantMode": "system_grant", -- Gitee From 1ca26d3cf26d8648302b8608cb378d66146e72a8 Mon Sep 17 00:00:00 2001 From: wpy88 Date: Fri, 13 Jun 2025 14:57:50 +0800 Subject: [PATCH 39/42] privatespacemanager add new permission Signed-off-by: wpy88 --- systemres/main/module.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/systemres/main/module.json b/systemres/main/module.json index 289877b0..5d399a38 100644 --- a/systemres/main/module.json +++ b/systemres/main/module.json @@ -5748,6 +5748,15 @@ "deprecated": "", "provisionEnable": true, "distributedSceneEnable": false + }, + { + "name": "ohos.permission.FILE_ACCESS_FOR_PRIVATE_SPACE", + "grantMode": "system_grant", + "availableLevel": "system_basic", + "since": 20, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false } ] } -- Gitee From b005a8e16f477832d9ac553f6f103e19160d61b3 Mon Sep 17 00:00:00 2001 From: weipengyu Date: Mon, 16 Jun 2025 14:09:33 +0000 Subject: [PATCH 40/42] update systemres/main/module.json. Signed-off-by: weipengyu --- systemres/main/module.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/systemres/main/module.json b/systemres/main/module.json index 5d399a38..5496dbfd 100644 --- a/systemres/main/module.json +++ b/systemres/main/module.json @@ -5741,7 +5741,7 @@ "distributedSceneEnable": false }, { - "name": "ohos.permission.ACCESS_DFX_LOG_DIR", + "name": "ohos.permission.FILE_ACCESS_FOR_PRIVATE_SPACE", "grantMode": "system_grant", "availableLevel": "system_basic", "since": 20, @@ -5750,7 +5750,7 @@ "distributedSceneEnable": false }, { - "name": "ohos.permission.FILE_ACCESS_FOR_PRIVATE_SPACE", + "name": "ohos.permission.ACCESS_DFX_LOG_DIR", "grantMode": "system_grant", "availableLevel": "system_basic", "since": 20, -- Gitee From 67fd5aab0e657d1e2660fdef4c4f5475349af6fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=AB=E5=9C=B0=E5=AE=81=E5=AE=81?= <756090608@qq.com> Date: Tue, 17 Jun 2025 18:10:33 +0800 Subject: [PATCH 41/42] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=81=A5=E6=8E=A7?= =?UTF-8?q?=E6=8B=8D=E7=85=A7=E5=9C=BA=E6=99=AF=E5=8D=A1=E7=89=87=E8=AE=BF?= =?UTF-8?q?=E9=97=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 绫地宁宁 <756090608@qq.com> --- systemres/main/module.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/systemres/main/module.json b/systemres/main/module.json index 289877b0..de2c9dc1 100644 --- a/systemres/main/module.json +++ b/systemres/main/module.json @@ -5748,6 +5748,15 @@ "deprecated": "", "provisionEnable": true, "distributedSceneEnable": false + }, + { + "name": "ohos.permission.ACCESS_CAMERA_SCENARIOS_CARD", + "grantMode": "system_grant", + "availableLevel": "system_basic", + "since": 20, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false } ] } -- Gitee From 194899d49b3e8dc8766ab3827767a656beadec77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=AB=E5=9C=B0=E5=AE=81=E5=AE=81?= <756090608@qq.com> Date: Wed, 18 Jun 2025 03:24:58 +0000 Subject: [PATCH 42/42] update systemres/main/module.json. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 绫地宁宁 <756090608@qq.com> --- systemres/main/module.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systemres/main/module.json b/systemres/main/module.json index de2c9dc1..8880caf3 100644 --- a/systemres/main/module.json +++ b/systemres/main/module.json @@ -5749,7 +5749,7 @@ "provisionEnable": true, "distributedSceneEnable": false }, - { + { "name": "ohos.permission.ACCESS_CAMERA_SCENARIOS_CARD", "grantMode": "system_grant", "availableLevel": "system_basic", -- Gitee