diff --git a/systemres/main/resources/2in1/element/float.json b/systemres/main/resources/2in1/element/float.json
index c77bd5e16b9cdebb7127224b7227faa5479aa917..5158614cb6eba1a935b7e625f2670a25c690e93b 100644
--- a/systemres/main/resources/2in1/element/float.json
+++ b/systemres/main/resources/2in1/element/float.json
@@ -85,7 +85,7 @@
"value": "1"
},
{
- "name": "toast_padding_new",
+ "name": "toast_padding_level8",
"value": "8.0vp"
},
{
diff --git a/systemres/main/resources/base/element/float.json b/systemres/main/resources/base/element/float.json
index 3d5c25ecb11110025a04519ba71c7255bad4dadc..54bf6b5640652c4a257a852ae695c581e93acc42 100644
--- a/systemres/main/resources/base/element/float.json
+++ b/systemres/main/resources/base/element/float.json
@@ -3799,6 +3799,62 @@
{
"name": "side_length",
"value":"288.0vp"
+ },
+ {
+ "name": "line_spacing",
+ "value": "0.0vp"
+ },
+ {
+ "name": "font_weight",
+ "value": "10.0"
+ },
+ {
+ "name": "text_align",
+ "value": "0.0"
+ },
+ {
+ "name": "text_align_error",
+ "value": "0.0"
+ },
+ {
+ "name": "toast_limit_height_ratio",
+ "value": "0.65"
+ },
+ {
+ "name": "toast_text_align",
+ "value": "0.0"
+ },
+ {
+ "name": "toast_align",
+ "value": "-1.0"
+ },
+ {
+ "name": "track_thickness",
+ "value": "4.0vp"
+ },
+ {
+ "name": "indicator_width_ratio",
+ "value": "0.135"
+ },
+ {
+ "name": "indicator_height_ratio",
+ "value": "0.087"
+ },
+ {
+ "name": "indicator_corner_radius_ratio",
+ "value": "0.01"
+ },
+ {
+ "name": "indicator_border_ratio",
+ "value": "0.06"
+ },
+ {
+ "name": "interval_ratio",
+ "value": "0.008"
+ },
+ {
+ "name": "toast_bg_theme_color_mode",
+ "value": "0.0"
}
]
}
\ No newline at end of file
diff --git a/systemres/main/resources/base/element/id_defined.json b/systemres/main/resources/base/element/id_defined.json
index 4085a43d422bf50cee61b2190decef965614543d..a7ef5030b2de289d6e76cdbc6ca5d336f9f6b1e0 100644
--- a/systemres/main/resources/base/element/id_defined.json
+++ b/systemres/main/resources/base/element/id_defined.json
@@ -26383,27 +26383,23 @@
},
{
"type": "float",
- "name": "placeholder_5236",
- "order": 5236,
- "flags": "private"
+ "name": "text_align",
+ "order": 5236
},
{
"type": "float",
- "name": "placeholder_5237",
- "order": 5237,
- "flags": "private"
+ "name": "line_spacing",
+ "order": 5237
},
{
"type": "float",
- "name": "placeholder_5238",
- "order": 5238,
- "flags": "private"
+ "name": "font_weight",
+ "order": 5238
},
{
"type": "float",
- "name": "placeholder_5239",
- "order": 5239,
- "flags": "private"
+ "name": "text_align_error",
+ "order": 5239
},
{
"type": "float",
@@ -26413,63 +26409,53 @@
},
{
"type": "float",
- "name": "placeholder_5241",
- "order": 5241,
- "flags": "private"
+ "name": "toast_limit_height_ratio",
+ "order": 5241
},
{
"type": "float",
- "name": "placeholder_5242",
- "order": 5242,
- "flags": "private"
+ "name": "toast_text_align",
+ "order": 5242
},
{
"type": "float",
- "name": "placeholder_5243",
- "order": 5243,
- "flags": "private"
+ "name": "toast_bg_theme_color_mode",
+ "order": 5243
},
{
- "type": "color",
- "name": "placeholder_5244",
- "order": 5244,
- "flags": "private"
+ "type": "float",
+ "name": "toast_align",
+ "order": 5244
},
{
"type": "float",
- "name": "placeholder_5245",
- "order": 5245,
- "flags": "private"
+ "name": "indicator_width_ratio",
+ "order": 5245
},
{
"type": "float",
- "name": "placeholder_5246",
- "order": 5246,
- "flags": "private"
+ "name": "indicator_height_ratio",
+ "order": 5246
},
{
"type": "float",
- "name": "placeholder_5247",
- "order": 5247,
- "flags": "private"
+ "name": "indicator_corner_radius_ratio",
+ "order": 5247
},
{
"type": "float",
- "name": "placeholder_5248",
- "order": 5248,
- "flags": "private"
+ "name": "indicator_border_ratio",
+ "order": 5248
},
{
"type": "float",
- "name": "placeholder_5249",
- "order": 5249,
- "flags": "private"
+ "name": "track_thickness",
+ "order": 5249
},
{
- "type": "color",
- "name": "placeholder_5250",
- "order": 5250,
- "flags": "private"
+ "type": "float",
+ "name": "interval_ratio",
+ "order": 5250
},
{
"type": "float",
diff --git a/systemres/main/resources/base/element/pattern.json b/systemres/main/resources/base/element/pattern.json
index bb8b1956329c025cb784dacd4d9bafad3bc56974..7beb1cf96303496e9ce9dd638a0188139d8dd50a 100644
--- a/systemres/main/resources/base/element/pattern.json
+++ b/systemres/main/resources/base/element/pattern.json
@@ -4733,6 +4733,18 @@
{
"name": "text_menu_search_is_support",
"value": "$string:res_menu_search_is_support"
+ },
+ {
+ "name": "text_line_spacing",
+ "value": "$float:line_spacing"
+ },
+ {
+ "name": "text_font_weight",
+ "value": "$float:font_weight"
+ },
+ {
+ "name": "text_align",
+ "value": "$float:text_align"
}
]
},
@@ -5174,6 +5186,10 @@
{
"name": "textfield_menu_search_is_support",
"value": "$string:res_menu_search_is_support"
+ },
+ {
+ "name": "textfield_error_text_align",
+ "value": "$float:text_align_error"
}
]
},
@@ -5444,6 +5460,22 @@
{
"name": "toast_background_blur_style",
"value": "$float:toast_background_blur_style"
+ },
+ {
+ "name": "toast_limit_height_ratio",
+ "value": "$float:toast_limit_height_ratio"
+ },
+ {
+ "name": "toast_text_align",
+ "value": "$float:toast_text_align"
+ },
+ {
+ "name": "toast_bg_theme_color_mode",
+ "value": "$float:toast_bg_theme_color_mode"
+ },
+ {
+ "name": "toast_align",
+ "value": "$float:toast_align"
}
]
},
@@ -7777,6 +7809,30 @@
{
"name": "limit_value_min_font_size",
"value": "$float:ohos_id_text_size_caption"
+ },
+ {
+ "name": "indicator_width_ratio",
+ "value": "$float:indicator_width_ratio"
+ },
+ {
+ "name": "indicator_height_ratio",
+ "value": "$float:indicator_height_ratio"
+ },
+ {
+ "name": "indicator_corner_radius_ratio",
+ "value": "$float:indicator_corner_radius_ratio"
+ },
+ {
+ "name": "indicator_border_ratio",
+ "value": "$float:indicator_border_ratio"
+ },
+ {
+ "name": "track_thickness",
+ "value": "$float:track_thickness"
+ },
+ {
+ "name": "interval_ratio",
+ "value": "$float:interval_ratio"
}
]
},
diff --git a/systemres/main/resources/wearable/element/color.json b/systemres/main/resources/wearable/element/color.json
index 1c08acf48b9d642dfee7d37695f30c943b073e1e..3e54c7c577f7488acefca963b90c42b3cffa3ff9 100644
--- a/systemres/main/resources/wearable/element/color.json
+++ b/systemres/main/resources/wearable/element/color.json
@@ -175,6 +175,98 @@
{
"name": "ohos_id_color_text_secondary",
"value": "#a9ffffff"
+ },
+ {
+ "name": "ohos_id_color_text_field_sub_bg",
+ "value": "#19ffffff"
+ },
+ {
+ "name": "ohos_id_color_text_hint",
+ "value": "#99ffffff"
+ },
+ {
+ "name": "ohos_id_color_dialog_bg",
+ "value": "#ff202224"
+ },
+ {
+ "name": "font_primary",
+ "value": "#e5ffffff"
+ },
+ {
+ "name": "ohos_id_color_subheading_separator",
+ "value": "#19ffffff"
+ },
+ {
+ "name": "ohos_id_color_datapanel_color1_start",
+ "value": "#EB933D"
+ },
+ {
+ "name": "ohos_id_color_datapanel_color2_start",
+ "value": "#D9542B"
+ },
+ {
+ "name": "ohos_id_color_datapanel_color3_start",
+ "value": "#D6568D"
+ },
+ {
+ "name": "ohos_id_color_datapanel_color4_start",
+ "value": "#8639BF"
+ },
+ {
+ "name": "ohos_id_color_datapanel_color5_start",
+ "value": "#5552D9"
+ },
+ {
+ "name": "ohos_id_color_datapanel_color6_start",
+ "value": "#217BD9"
+ },
+ {
+ "name": "ohos_id_color_datapanel_color8_start",
+ "value": "#70BA5D"
+ },
+ {
+ "name": "ohos_id_color_datapanel_color9_start",
+ "value": "#6B6B76"
+ },
+ {
+ "name": "ohos_id_color_datapanel_color1_end",
+ "value": "#D1A738"
+ },
+ {
+ "name": "ohos_id_color_datapanel_color2_end",
+ "value": "#E67E50"
+ },
+ {
+ "name": "ohos_id_color_datapanel_color3_end",
+ "value": "#D5749E"
+ },
+ {
+ "name": "ohos_id_color_datapanel_color4_end",
+ "value": "#9973D1"
+ },
+ {
+ "name": "ohos_id_color_datapanel_color5_end",
+ "value": "#7977D9"
+ },
+ {
+ "name": "ohos_id_color_datapanel_color6_end",
+ "value": "#4C81D9"
+ },
+ {
+ "name": "ohos_id_color_datapanel_color7_end",
+ "value": "#5EA6D1"
+ },
+ {
+ "name": "ohos_id_color_datapanel_color8_end",
+ "value": "#91C23A"
+ },
+ {
+ "name": "ohos_id_color_datapanel_color9_end",
+ "value": "#8C8C99"
+ },
+ {
+ "name": "ohos_id_color_primary_contrary",
+ "value": "#A9000000"
}
]
}
\ No newline at end of file
diff --git a/systemres/main/resources/wearable/element/float.json b/systemres/main/resources/wearable/element/float.json
index 983f825d4ab2b00846a9c7ea91a8f3b04eeedc38..45a871b034a9ecf763b63dbad5f842534418bf00 100644
--- a/systemres/main/resources/wearable/element/float.json
+++ b/systemres/main/resources/wearable/element/float.json
@@ -87,6 +87,126 @@
{
"name": "ohos_id_default_progress_diameter",
"value": "46.0vp"
+ },
+ {
+ "name": "ohos_id_text_font_size",
+ "value": "15.0fp"
+ },
+ {
+ "name": "line_spacing",
+ "value": "1.0vp"
+ },
+ {
+ "name": "font_weight",
+ "value": "14.0"
+ },
+ {
+ "name": "text_align",
+ "value": "1.0"
+ },
+ {
+ "name": "ohos_id_textfield_height",
+ "value": "34.0vp"
+ },
+ {
+ "name": "ohos_id_textfield_content_height",
+ "value": "28.0vp"
+ },
+ {
+ "name": "ohos_id_textfield_border_radius",
+ "value": "22.0vp"
+ },
+ {
+ "name": "ohos_id_textfield_padding_horizontal",
+ "value": "10.0vp"
+ },
+ {
+ "name": "ohos_id_text_size_body3",
+ "value": "13.0fp"
+ },
+ {
+ "name": "text_align_error",
+ "value": "1.0"
+ },
+ {
+ "name": "ohos_id_textfield_icon_size",
+ "value": "28.0vp"
+ },
+ {
+ "name": "ohos_id_textfield_icon_hot_zone_size",
+ "value": "46.0vp"
+ },
+ {
+ "name": "Body_M",
+ "value": "15.0fp"
+ },
+ {
+ "name": "ohos_id_toast_content_min_height",
+ "value": "40.0vp"
+ },
+ {
+ "name": "ohos_id_toast_content_limit_max_width",
+ "value": "201.0vp"
+ },
+ {
+ "name": "toast_border_radius_new",
+ "value": "20.0vp"
+ },
+ {
+ "name": "toast_padding_level4",
+ "value": "10.0vp"
+ },
+ {
+ "name": "toast_padding_level8",
+ "value": "10.0vp"
+ },
+ {
+ "name": "toast_align",
+ "value": "4.0"
+ },
+ {
+ "name": "toast_bg_theme_color_mode",
+ "value": "2.0"
+ },
+ {
+ "name": "ohos_id_toast_content_min_width",
+ "value": "116.0vp"
+ },
+ {
+ "name": "toast_limit_height_ratio",
+ "value": "0.61"
+ },
+ {
+ "name": "toast_text_align",
+ "value": "1.0"
+ },
+ {
+ "name": "ohos_id_datapanel_thickness",
+ "value": "10.0vp"
+ },
+ {
+ "name": "indicator_width_ratio",
+ "value": "0.09"
+ },
+ {
+ "name": "indicator_height_ratio",
+ "value": "0.058"
+ },
+ {
+ "name": "indicator_corner_radius_ratio",
+ "value": "0.0134"
+ },
+ {
+ "name": "indicator_border_ratio",
+ "value": "0.054"
+ },
+ {
+ "name": "track_thickness",
+ "value": "10.0vp"
+ },
+ {
+ "name": "interval_ratio",
+ "value": "0.009"
}
]
}
\ No newline at end of file
diff --git a/systemres/main/resources/wearable/media/ohos_hide_password.svg b/systemres/main/resources/wearable/media/ohos_hide_password.svg
new file mode 100644
index 0000000000000000000000000000000000000000..6597e7b37f396080ada11bc7110908052fd46135
--- /dev/null
+++ b/systemres/main/resources/wearable/media/ohos_hide_password.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/systemres/main/resources/wearable/media/ohos_show_password.svg b/systemres/main/resources/wearable/media/ohos_show_password.svg
new file mode 100644
index 0000000000000000000000000000000000000000..063196f107b9af7150a8c5867c349064afc58b3e
--- /dev/null
+++ b/systemres/main/resources/wearable/media/ohos_show_password.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file