From 273bd8b4fb918a4303207215b2b8369fbc275000 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 08 十二月 2020 18:58:44 +0800
Subject: [PATCH] Merge branch 'CJL-NEW'
---
HDL-ON_Android/Resources/Resource.designer.cs | 147 +++++++++++++++++++++++++------------------------
1 files changed, 75 insertions(+), 72 deletions(-)
diff --git a/HDL-ON_Android/Resources/Resource.designer.cs b/HDL-ON_Android/Resources/Resource.designer.cs
index 9acaeea..f6a25e6 100644
--- a/HDL-ON_Android/Resources/Resource.designer.cs
+++ b/HDL-ON_Android/Resources/Resource.designer.cs
@@ -1910,220 +1910,223 @@
public const int button_material_light = 2131099685;
// aapt resource value: 0x7F060026
- public const int colorAccent = 2131099686;
+ public const int cc_b_gray = 2131099686;
// aapt resource value: 0x7F060027
- public const int colorPrimary = 2131099687;
+ public const int colorAccent = 2131099687;
// aapt resource value: 0x7F060028
- public const int colorPrimaryDark = 2131099688;
+ public const int colorPrimary = 2131099688;
// aapt resource value: 0x7F060029
- public const int design_bottom_navigation_shadow_color = 2131099689;
+ public const int colorPrimaryDark = 2131099689;
// aapt resource value: 0x7F06002A
- public const int design_error = 2131099690;
+ public const int design_bottom_navigation_shadow_color = 2131099690;
// aapt resource value: 0x7F06002B
- public const int design_fab_shadow_end_color = 2131099691;
+ public const int design_error = 2131099691;
// aapt resource value: 0x7F06002C
- public const int design_fab_shadow_mid_color = 2131099692;
+ public const int design_fab_shadow_end_color = 2131099692;
// aapt resource value: 0x7F06002D
- public const int design_fab_shadow_start_color = 2131099693;
+ public const int design_fab_shadow_mid_color = 2131099693;
// aapt resource value: 0x7F06002E
- public const int design_fab_stroke_end_inner_color = 2131099694;
+ public const int design_fab_shadow_start_color = 2131099694;
// aapt resource value: 0x7F06002F
- public const int design_fab_stroke_end_outer_color = 2131099695;
+ public const int design_fab_stroke_end_inner_color = 2131099695;
// aapt resource value: 0x7F060030
- public const int design_fab_stroke_top_inner_color = 2131099696;
+ public const int design_fab_stroke_end_outer_color = 2131099696;
// aapt resource value: 0x7F060031
- public const int design_fab_stroke_top_outer_color = 2131099697;
+ public const int design_fab_stroke_top_inner_color = 2131099697;
// aapt resource value: 0x7F060032
- public const int design_snackbar_background_color = 2131099698;
+ public const int design_fab_stroke_top_outer_color = 2131099698;
// aapt resource value: 0x7F060033
- public const int design_tint_password_toggle = 2131099699;
+ public const int design_snackbar_background_color = 2131099699;
// aapt resource value: 0x7F060034
- public const int dim_foreground_disabled_material_dark = 2131099700;
+ public const int design_tint_password_toggle = 2131099700;
// aapt resource value: 0x7F060035
- public const int dim_foreground_disabled_material_light = 2131099701;
+ public const int dim_foreground_disabled_material_dark = 2131099701;
// aapt resource value: 0x7F060036
- public const int dim_foreground_material_dark = 2131099702;
+ public const int dim_foreground_disabled_material_light = 2131099702;
// aapt resource value: 0x7F060037
- public const int dim_foreground_material_light = 2131099703;
+ public const int dim_foreground_material_dark = 2131099703;
// aapt resource value: 0x7F060038
- public const int error_color_material = 2131099704;
+ public const int dim_foreground_material_light = 2131099704;
// aapt resource value: 0x7F060039
- public const int foreground_material_dark = 2131099705;
+ public const int error_color_material = 2131099705;
// aapt resource value: 0x7F06003A
- public const int foreground_material_light = 2131099706;
+ public const int foreground_material_dark = 2131099706;
// aapt resource value: 0x7F06003B
- public const int gd_top_view = 2131099707;
+ public const int foreground_material_light = 2131099707;
// aapt resource value: 0x7F06003C
- public const int highlighted_text_material_dark = 2131099708;
+ public const int gd_top_view = 2131099708;
// aapt resource value: 0x7F06003D
- public const int highlighted_text_material_light = 2131099709;
+ public const int highlighted_text_material_dark = 2131099709;
// aapt resource value: 0x7F06003E
- public const int ic_launcher_background = 2131099710;
+ public const int highlighted_text_material_light = 2131099710;
// aapt resource value: 0x7F06003F
- public const int material_blue_grey_800 = 2131099711;
+ public const int ic_launcher_background = 2131099711;
// aapt resource value: 0x7F060040
- public const int material_blue_grey_900 = 2131099712;
+ public const int material_blue_grey_800 = 2131099712;
// aapt resource value: 0x7F060041
- public const int material_blue_grey_950 = 2131099713;
+ public const int material_blue_grey_900 = 2131099713;
// aapt resource value: 0x7F060042
- public const int material_deep_teal_200 = 2131099714;
+ public const int material_blue_grey_950 = 2131099714;
// aapt resource value: 0x7F060043
- public const int material_deep_teal_500 = 2131099715;
+ public const int material_deep_teal_200 = 2131099715;
// aapt resource value: 0x7F060044
- public const int material_grey_100 = 2131099716;
+ public const int material_deep_teal_500 = 2131099716;
// aapt resource value: 0x7F060045
- public const int material_grey_300 = 2131099717;
+ public const int material_grey_100 = 2131099717;
// aapt resource value: 0x7F060046
- public const int material_grey_50 = 2131099718;
+ public const int material_grey_300 = 2131099718;
// aapt resource value: 0x7F060047
- public const int material_grey_600 = 2131099719;
+ public const int material_grey_50 = 2131099719;
// aapt resource value: 0x7F060048
- public const int material_grey_800 = 2131099720;
+ public const int material_grey_600 = 2131099720;
// aapt resource value: 0x7F060049
- public const int material_grey_850 = 2131099721;
+ public const int material_grey_800 = 2131099721;
// aapt resource value: 0x7F06004A
- public const int material_grey_900 = 2131099722;
+ public const int material_grey_850 = 2131099722;
// aapt resource value: 0x7F06004B
- public const int material_red_500 = 2131099723;
+ public const int material_grey_900 = 2131099723;
// aapt resource value: 0x7F06004C
- public const int notification_action_color_filter = 2131099724;
+ public const int material_red_500 = 2131099724;
// aapt resource value: 0x7F06004D
- public const int notification_icon_bg_color = 2131099725;
+ public const int notification_action_color_filter = 2131099725;
// aapt resource value: 0x7F06004E
- public const int notification_material_background_media_default_color = 2131099726;
+ public const int notification_icon_bg_color = 2131099726;
// aapt resource value: 0x7F06004F
- public const int pickerview_bgColor_default = 2131099727;
+ public const int notification_material_background_media_default_color = 2131099727;
// aapt resource value: 0x7F060050
- public const int pickerview_bgColor_overlay = 2131099728;
+ public const int pickerview_bgColor_default = 2131099728;
// aapt resource value: 0x7F060051
- public const int pickerview_bg_topbar = 2131099729;
+ public const int pickerview_bgColor_overlay = 2131099729;
// aapt resource value: 0x7F060052
- public const int pickerview_timebtn_nor = 2131099730;
+ public const int pickerview_bg_topbar = 2131099730;
// aapt resource value: 0x7F060053
- public const int pickerview_timebtn_pre = 2131099731;
+ public const int pickerview_timebtn_nor = 2131099731;
// aapt resource value: 0x7F060054
- public const int pickerview_topbar_title = 2131099732;
+ public const int pickerview_timebtn_pre = 2131099732;
// aapt resource value: 0x7F060055
- public const int pickerview_wheelview_textcolor_center = 2131099733;
+ public const int pickerview_topbar_title = 2131099733;
// aapt resource value: 0x7F060056
- public const int pickerview_wheelview_textcolor_divider = 2131099734;
+ public const int pickerview_wheelview_textcolor_center = 2131099734;
// aapt resource value: 0x7F060057
- public const int pickerview_wheelview_textcolor_out = 2131099735;
+ public const int pickerview_wheelview_textcolor_divider = 2131099735;
// aapt resource value: 0x7F060058
- public const int primary_dark_material_dark = 2131099736;
+ public const int pickerview_wheelview_textcolor_out = 2131099736;
// aapt resource value: 0x7F060059
- public const int primary_dark_material_light = 2131099737;
+ public const int primary_dark_material_dark = 2131099737;
// aapt resource value: 0x7F06005A
- public const int primary_material_dark = 2131099738;
+ public const int primary_dark_material_light = 2131099738;
// aapt resource value: 0x7F06005B
- public const int primary_material_light = 2131099739;
+ public const int primary_material_dark = 2131099739;
// aapt resource value: 0x7F06005C
- public const int primary_text_default_material_dark = 2131099740;
+ public const int primary_material_light = 2131099740;
// aapt resource value: 0x7F06005D
- public const int primary_text_default_material_light = 2131099741;
+ public const int primary_text_default_material_dark = 2131099741;
// aapt resource value: 0x7F06005E
- public const int primary_text_disabled_material_dark = 2131099742;
+ public const int primary_text_default_material_light = 2131099742;
// aapt resource value: 0x7F06005F
- public const int primary_text_disabled_material_light = 2131099743;
+ public const int primary_text_disabled_material_dark = 2131099743;
// aapt resource value: 0x7F060060
- public const int ripple_material_dark = 2131099744;
+ public const int primary_text_disabled_material_light = 2131099744;
// aapt resource value: 0x7F060061
- public const int ripple_material_light = 2131099745;
+ public const int ripple_material_dark = 2131099745;
// aapt resource value: 0x7F060062
- public const int secondary_text_default_material_dark = 2131099746;
+ public const int ripple_material_light = 2131099746;
// aapt resource value: 0x7F060063
- public const int secondary_text_default_material_light = 2131099747;
+ public const int secondary_text_default_material_dark = 2131099747;
// aapt resource value: 0x7F060064
- public const int secondary_text_disabled_material_dark = 2131099748;
+ public const int secondary_text_default_material_light = 2131099748;
// aapt resource value: 0x7F060065
- public const int secondary_text_disabled_material_light = 2131099749;
+ public const int secondary_text_disabled_material_dark = 2131099749;
// aapt resource value: 0x7F060066
- public const int switch_thumb_disabled_material_dark = 2131099750;
+ public const int secondary_text_disabled_material_light = 2131099750;
// aapt resource value: 0x7F060067
- public const int switch_thumb_disabled_material_light = 2131099751;
+ public const int switch_thumb_disabled_material_dark = 2131099751;
// aapt resource value: 0x7F060068
- public const int switch_thumb_material_dark = 2131099752;
+ public const int switch_thumb_disabled_material_light = 2131099752;
// aapt resource value: 0x7F060069
- public const int switch_thumb_material_light = 2131099753;
+ public const int switch_thumb_material_dark = 2131099753;
// aapt resource value: 0x7F06006A
- public const int switch_thumb_normal_material_dark = 2131099754;
+ public const int switch_thumb_material_light = 2131099754;
// aapt resource value: 0x7F06006B
- public const int switch_thumb_normal_material_light = 2131099755;
+ public const int switch_thumb_normal_material_dark = 2131099755;
// aapt resource value: 0x7F06006C
- public const int tooltip_background_dark = 2131099756;
+ public const int switch_thumb_normal_material_light = 2131099756;
// aapt resource value: 0x7F06006D
- public const int tooltip_background_light = 2131099757;
+ public const int tooltip_background_dark = 2131099757;
+
+ // aapt resource value: 0x7F06006E
+ public const int tooltip_background_light = 2131099758;
static Color()
{
--
Gitblit v1.8.0