From 5986f63b75bd81c6cef262c670e9251c038cbf5d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 17 十二月 2019 17:21:07 +0800
Subject: [PATCH] 合并一个版本
---
ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs | 93 ++++++++++++++++++++++++----------------------
1 files changed, 48 insertions(+), 45 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
index bcf64c2..4d98be1 100644
--- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
+++ b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
@@ -1698,44 +1698,44 @@
public partial class Color
{
- // aapt resource value: 0x7f0d0051
- public const int abc_background_cache_hint_selector_material_dark = 2131558481;
-
// aapt resource value: 0x7f0d0052
- public const int abc_background_cache_hint_selector_material_light = 2131558482;
+ public const int abc_background_cache_hint_selector_material_dark = 2131558482;
// aapt resource value: 0x7f0d0053
- public const int abc_btn_colored_borderless_text_material = 2131558483;
+ public const int abc_background_cache_hint_selector_material_light = 2131558483;
// aapt resource value: 0x7f0d0054
- public const int abc_btn_colored_text_material = 2131558484;
+ public const int abc_btn_colored_borderless_text_material = 2131558484;
// aapt resource value: 0x7f0d0055
- public const int abc_color_highlight_material = 2131558485;
+ public const int abc_btn_colored_text_material = 2131558485;
// aapt resource value: 0x7f0d0056
- public const int abc_hint_foreground_material_dark = 2131558486;
+ public const int abc_color_highlight_material = 2131558486;
// aapt resource value: 0x7f0d0057
- public const int abc_hint_foreground_material_light = 2131558487;
+ public const int abc_hint_foreground_material_dark = 2131558487;
+
+ // aapt resource value: 0x7f0d0058
+ public const int abc_hint_foreground_material_light = 2131558488;
// aapt resource value: 0x7f0d0000
public const int abc_input_method_navigation_guard = 2131558400;
- // aapt resource value: 0x7f0d0058
- public const int abc_primary_text_disable_only_material_dark = 2131558488;
-
// aapt resource value: 0x7f0d0059
- public const int abc_primary_text_disable_only_material_light = 2131558489;
+ public const int abc_primary_text_disable_only_material_dark = 2131558489;
// aapt resource value: 0x7f0d005a
- public const int abc_primary_text_material_dark = 2131558490;
+ public const int abc_primary_text_disable_only_material_light = 2131558490;
// aapt resource value: 0x7f0d005b
- public const int abc_primary_text_material_light = 2131558491;
+ public const int abc_primary_text_material_dark = 2131558491;
// aapt resource value: 0x7f0d005c
- public const int abc_search_url_text = 2131558492;
+ public const int abc_primary_text_material_light = 2131558492;
+
+ // aapt resource value: 0x7f0d005d
+ public const int abc_search_url_text = 2131558493;
// aapt resource value: 0x7f0d0001
public const int abc_search_url_text_normal = 2131558401;
@@ -1746,29 +1746,29 @@
// aapt resource value: 0x7f0d0003
public const int abc_search_url_text_selected = 2131558403;
- // aapt resource value: 0x7f0d005d
- public const int abc_secondary_text_material_dark = 2131558493;
-
// aapt resource value: 0x7f0d005e
- public const int abc_secondary_text_material_light = 2131558494;
+ public const int abc_secondary_text_material_dark = 2131558494;
// aapt resource value: 0x7f0d005f
- public const int abc_tint_btn_checkable = 2131558495;
+ public const int abc_secondary_text_material_light = 2131558495;
// aapt resource value: 0x7f0d0060
- public const int abc_tint_default = 2131558496;
+ public const int abc_tint_btn_checkable = 2131558496;
// aapt resource value: 0x7f0d0061
- public const int abc_tint_edittext = 2131558497;
+ public const int abc_tint_default = 2131558497;
// aapt resource value: 0x7f0d0062
- public const int abc_tint_seek_thumb = 2131558498;
+ public const int abc_tint_edittext = 2131558498;
// aapt resource value: 0x7f0d0063
- public const int abc_tint_spinner = 2131558499;
+ public const int abc_tint_seek_thumb = 2131558499;
// aapt resource value: 0x7f0d0064
- public const int abc_tint_switch_track = 2131558500;
+ public const int abc_tint_spinner = 2131558500;
+
+ // aapt resource value: 0x7f0d0065
+ public const int abc_tint_switch_track = 2131558501;
// aapt resource value: 0x7f0d0004
public const int accent_material_dark = 2131558404;
@@ -1815,8 +1815,8 @@
// aapt resource value: 0x7f0d003c
public const int design_bottom_navigation_shadow_color = 2131558460;
- // aapt resource value: 0x7f0d0065
- public const int design_error = 2131558501;
+ // aapt resource value: 0x7f0d0066
+ public const int design_error = 2131558502;
// aapt resource value: 0x7f0d003d
public const int design_fab_shadow_end_color = 2131558461;
@@ -1842,8 +1842,8 @@
// aapt resource value: 0x7f0d0044
public const int design_snackbar_background_color = 2131558468;
- // aapt resource value: 0x7f0d0066
- public const int design_tint_password_toggle = 2131558502;
+ // aapt resource value: 0x7f0d0067
+ public const int design_tint_password_toggle = 2131558503;
// aapt resource value: 0x7f0d0012
public const int dim_foreground_disabled_material_dark = 2131558418;
@@ -1865,6 +1865,9 @@
// aapt resource value: 0x7f0d0018
public const int foreground_material_light = 2131558424;
+
+ // aapt resource value: 0x7f0d0048
+ public const int gd_top_view = 2131558472;
// aapt resource value: 0x7f0d0019
public const int highlighted_text_material_dark = 2131558425;
@@ -1920,32 +1923,32 @@
// aapt resource value: 0x7f0d003b
public const int notification_material_background_media_default_color = 2131558459;
- // aapt resource value: 0x7f0d0048
- public const int pickerview_bgColor_default = 2131558472;
-
// aapt resource value: 0x7f0d0049
- public const int pickerview_bgColor_overlay = 2131558473;
+ public const int pickerview_bgColor_default = 2131558473;
// aapt resource value: 0x7f0d004a
- public const int pickerview_bg_topbar = 2131558474;
+ public const int pickerview_bgColor_overlay = 2131558474;
// aapt resource value: 0x7f0d004b
- public const int pickerview_timebtn_nor = 2131558475;
+ public const int pickerview_bg_topbar = 2131558475;
// aapt resource value: 0x7f0d004c
- public const int pickerview_timebtn_pre = 2131558476;
+ public const int pickerview_timebtn_nor = 2131558476;
// aapt resource value: 0x7f0d004d
- public const int pickerview_topbar_title = 2131558477;
+ public const int pickerview_timebtn_pre = 2131558477;
// aapt resource value: 0x7f0d004e
- public const int pickerview_wheelview_textcolor_center = 2131558478;
+ public const int pickerview_topbar_title = 2131558478;
// aapt resource value: 0x7f0d004f
- public const int pickerview_wheelview_textcolor_divider = 2131558479;
+ public const int pickerview_wheelview_textcolor_center = 2131558479;
// aapt resource value: 0x7f0d0050
- public const int pickerview_wheelview_textcolor_out = 2131558480;
+ public const int pickerview_wheelview_textcolor_divider = 2131558480;
+
+ // aapt resource value: 0x7f0d0051
+ public const int pickerview_wheelview_textcolor_out = 2131558481;
// aapt resource value: 0x7f0d0027
public const int primary_dark_material_dark = 2131558439;
@@ -1995,11 +1998,11 @@
// aapt resource value: 0x7f0d0036
public const int switch_thumb_disabled_material_light = 2131558454;
- // aapt resource value: 0x7f0d0067
- public const int switch_thumb_material_dark = 2131558503;
-
// aapt resource value: 0x7f0d0068
- public const int switch_thumb_material_light = 2131558504;
+ public const int switch_thumb_material_dark = 2131558504;
+
+ // aapt resource value: 0x7f0d0069
+ public const int switch_thumb_material_light = 2131558505;
// aapt resource value: 0x7f0d0037
public const int switch_thumb_normal_material_dark = 2131558455;
--
Gitblit v1.8.0