diff --git a/systemres/main/resources/base/element/color.json b/systemres/main/resources/base/element/color.json index 85523d3e3eaa9fa39bc8cfef198ff9ee0bc12270..0ecbb137987840a932da679539696570ff7dc674 100644 --- a/systemres/main/resources/base/element/color.json +++ b/systemres/main/resources/base/element/color.json @@ -1631,6 +1631,22 @@ { "name": "comp_background_float", "value": "#262626" + }, + { + "name": "search_normal_color", + "value": "#00000000" + }, + { + "name": "search_cancel_button_hover_color", + "value": "#0DFFFFFF" + }, + { + "name": "search_cancel_button_press_color", + "value": "#1AFFFFFF" + }, + { + "name": "search_cancel_button_focus_color", + "value": "#00000000" } ] } diff --git a/systemres/main/resources/base/element/float_sys.json b/systemres/main/resources/base/element/float_sys.json index ccd553eac1d8c8c2dbe43f87595d3146b6765316..4a6899106ff10b2d6be7216d4d7b0c0d1ac4496c 100644 --- a/systemres/main/resources/base/element/float_sys.json +++ b/systemres/main/resources/base/element/float_sys.json @@ -704,6 +704,10 @@ "name": "textfield_border_radius", "value": "$float:corner_radius_level10" }, + { + "name": "textfield_cursor_height", + "value": "0.0vp" + }, { "name": "search_border_width", "value": "0.0vp" @@ -740,6 +744,10 @@ "name": "search_focus_padding", "value": "1.0vp" }, + { + "name": "search_cancel_button_focus_padding", + "value": "0.0vp" + }, { "name": "search_symbol_icon_height", "value": "16.0fp" diff --git a/systemres/main/resources/base/element/id_defined.json b/systemres/main/resources/base/element/id_defined.json index c6c309d89a9a3d94fc949530caef3a97a6d61209..63223f933adce5cb3bf0372e02a0a6ee3e955492 100644 --- a/systemres/main/resources/base/element/id_defined.json +++ b/systemres/main/resources/base/element/id_defined.json @@ -33286,6 +33286,42 @@ "name": "app_theme_drag_distancethreshold", "order": 6602, "flags": "private" + }, + { + "type": "color", + "name": "search_normal_color", + "order": 6603, + "flags": "private" + }, + { + "type": "color", + "name": "search_cancel_button_hover_color", + "order": 6604, + "flags": "private" + }, + { + "type": "color", + "name": "search_cancel_button_press_color", + "order": 6605, + "flags": "private" + }, + { + "type": "color", + "name": "search_cancel_button_focus_color", + "order": 6606, + "flags": "private" + }, + { + "type": "float", + "name": "search_cancel_button_focus_padding", + "order": 6607, + "flags": "private" + }, + { + "type": "float", + "name": "textfield_cursor_height", + "order": 6608, + "flags": "private" } ] } diff --git a/systemres/main/resources/base/element/pattern.json b/systemres/main/resources/base/element/pattern.json index aa28048057d3d10e33b66943f17d5ddc74b63231..22ca20742c476e94d90d42ca94e659ba2d101bfd 100644 --- a/systemres/main/resources/base/element/pattern.json +++ b/systemres/main/resources/base/element/pattern.json @@ -4407,6 +4407,26 @@ { "name": "search_focus_glow_padding", "value": "$float:search_focus_padding" + }, + { + "name": "search_normal_color", + "value": "$color:search_normal_color" + }, + { + "name": "search_cancel_button_hover_color", + "value": "$color:search_cancel_button_hover_color" + }, + { + "name": "search_cancel_button_press_color", + "value": "$color:search_cancel_button_press_color" + }, + { + "name": "search_cancel_button_focus_color", + "value": "$color:search_cancel_button_focus_color" + }, + { + "name": "search_cancel_button_focus_padding", + "value": "$float:search_cancel_button_focus_padding" } ] }, @@ -5213,6 +5233,10 @@ "name": "cursor_color", "value": "$color:textfield_cursor_color" }, + { + "name": "cursor_height", + "value": "$float:textfield_cursor_height" + }, { "name": "error_text_border_color", "value": "$color:alert" diff --git a/systemres/main/resources/tv/element/color_sys.json b/systemres/main/resources/tv/element/color_sys.json index 0728d8628b62f83496a7e7569043a1126cf5686e..488a878dc0e67dda6113e84813ad5120cfb82caa 100644 --- a/systemres/main/resources/tv/element/color_sys.json +++ b/systemres/main/resources/tv/element/color_sys.json @@ -102,7 +102,7 @@ }, { "name": "textfield_bg_color", - "value": "#33F1F3F5" + "value": "$color:comp_background_tertiary" }, { "name": "searchkeyboard_primary_control_color", @@ -130,7 +130,7 @@ }, { "name": "search_icon_color", - "value": "$color:font_secondary" + "value": "$color:icon_secondary" }, { "name": "search_placeholder_focus_color", @@ -146,7 +146,7 @@ }, { "name": "search_container_focus_color", - "value": "$color:textfield_bg_color" + "value": "$color:comp_background_focus" }, { "name": "search_icon_focus_color", @@ -603,6 +603,22 @@ { "name": "segment_button_border_color", "value": "#26FFFFFF" + }, + { + "name": "search_normal_color", + "value": "#19FFFFFF" + }, + { + "name": "search_cancel_button_hover_color", + "value": "$color:interactive_hover" + }, + { + "name": "search_cancel_button_press_color", + "value": "$color:interactive_pressed" + }, + { + "name": "search_cancel_button_focus_color", + "value": "$color:comp_background_focus" } ] } \ No newline at end of file diff --git a/systemres/main/resources/tv/element/float.json b/systemres/main/resources/tv/element/float.json index 9f9060872f0ecb9fae4cfcbe9a6866cb4ad3eec8..8d502f75c15dcfa112a3818cf5f07c0760d78922 100644 --- a/systemres/main/resources/tv/element/float.json +++ b/systemres/main/resources/tv/element/float.json @@ -58,7 +58,7 @@ }, { "name": "ohos_id_text_size_body1", - "value": "18.0fp" + "value": "16.0fp" }, { "name": "ohos_id_text_size_body2", @@ -323,6 +323,14 @@ { "name": "datapanel_track_shadow_radius", "value": "18.0vp" + }, + { + "name": "padding_level1", + "value": "5.0vp" + }, + { + "name": "padding_level6", + "value": "16.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 799498fc39e04a60d4c56a0c151d9db39c30a4eb..c7b7a04c5303f72172f6012506ec346c5f760836 100644 --- a/systemres/main/resources/tv/element/float_sys.json +++ b/systemres/main/resources/tv/element/float_sys.json @@ -238,7 +238,7 @@ }, { "name": "search_default_height", - "value": "54.0vp" + "value": "52.0vp" }, { "name": "ohos_id_search_text_field_border_radius", @@ -248,10 +248,18 @@ "name": "search_focus_padding", "value": "3.0vp" }, + { + "name": "search_cancel_button_focus_padding", + "value": "4.0vp" + }, { "name": "textfield_border_radius", "value": "27.0vp" }, + { + "name": "textfield_cursor_height", + "value": "5.0vp" + }, { "name": "search_border_width", "value": "1.0vp" diff --git a/systemres/main/resources/tv/element/pattern.json b/systemres/main/resources/tv/element/pattern.json index 7ccad721a6a11f9ce727705154f4b50b40c4d426..e710c6438de8f57125b97f9a2a881a8e7a14393d 100644 --- a/systemres/main/resources/tv/element/pattern.json +++ b/systemres/main/resources/tv/element/pattern.json @@ -1294,7 +1294,7 @@ }, { "name": "tips_text_color", - "value": "$color:ohos_id_color_text_hint" + "value": "$color:font_secondary" }, { "name": "text_color", @@ -1330,7 +1330,11 @@ }, { "name": "cursor_color", - "value": "$color:textfield_cursor_color" + "value": "$color:brand_font" + }, + { + "name": "cursor_height", + "value": "$float:textfield_cursor_height" }, { "name": "error_text_border_color",