From a7adf98ff4ac801342853b1f9231cc1ab5acebf3 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 14 十一月 2019 17:25:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs | 240 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 157 insertions(+), 83 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
old mode 100755
new mode 100644
index c4882fc..a91fee8
--- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
+++ b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
@@ -609,6 +609,21 @@
// aapt resource value: 0x7f01008e
public const int controlBackground = 2130772110;
+ // aapt resource value: 0x7f010114
+ public const int curtain_bar_bg_color = 2130772244;
+
+ // aapt resource value: 0x7f010115
+ public const int curtain_bar_border_color = 2130772245;
+
+ // aapt resource value: 0x7f010112
+ public const int curtain_bar_color = 2130772242;
+
+ // aapt resource value: 0x7f010117
+ public const int curtain_bar_height = 2130772247;
+
+ // aapt resource value: 0x7f010116
+ public const int curtain_bar_width = 2130772246;
+
// aapt resource value: 0x7f01000f
public const int customNavigationLayout = 2130771983;
@@ -874,7 +889,10 @@
public const int searchViewStyle = 2130772087;
// aapt resource value: 0x7f010113
- public const int second_wave_color = 2130772243;
+ public const int second_curtain_bar_color = 2130772243;
+
+ // aapt resource value: 0x7f010119
+ public const int second_wave_color = 2130772249;
// aapt resource value: 0x7f0100a2
public const int seekBarStyle = 2130772130;
@@ -1071,38 +1089,38 @@
// aapt resource value: 0x7f0100d0
public const int voiceIcon = 2130772176;
- // aapt resource value: 0x7f010114
- public const int wave_bg_color = 2130772244;
-
- // aapt resource value: 0x7f010115
- public const int wave_border_color = 2130772245;
-
- // aapt resource value: 0x7f010112
- public const int wave_color = 2130772242;
-
- // aapt resource value: 0x7f010117
- public const int wave_height = 2130772247;
-
- // aapt resource value: 0x7f010116
- public const int wave_width = 2130772246;
-
- // aapt resource value: 0x7f01011c
- public const int wheelview_dividerColor = 2130772252;
-
- // aapt resource value: 0x7f010118
- public const int wheelview_gravity = 2130772248;
-
- // aapt resource value: 0x7f01011d
- public const int wheelview_lineSpacingMultiplier = 2130772253;
+ // aapt resource value: 0x7f01011a
+ public const int wave_bg_color = 2130772250;
// aapt resource value: 0x7f01011b
- public const int wheelview_textColorCenter = 2130772251;
+ public const int wave_border_color = 2130772251;
- // aapt resource value: 0x7f01011a
- public const int wheelview_textColorOut = 2130772250;
+ // aapt resource value: 0x7f010118
+ public const int wave_color = 2130772248;
- // aapt resource value: 0x7f010119
- public const int wheelview_textSize = 2130772249;
+ // aapt resource value: 0x7f01011d
+ public const int wave_height = 2130772253;
+
+ // aapt resource value: 0x7f01011c
+ public const int wave_width = 2130772252;
+
+ // aapt resource value: 0x7f010122
+ public const int wheelview_dividerColor = 2130772258;
+
+ // aapt resource value: 0x7f01011e
+ public const int wheelview_gravity = 2130772254;
+
+ // aapt resource value: 0x7f010123
+ public const int wheelview_lineSpacingMultiplier = 2130772259;
+
+ // aapt resource value: 0x7f010121
+ public const int wheelview_textColorCenter = 2130772257;
+
+ // aapt resource value: 0x7f010120
+ public const int wheelview_textColorOut = 2130772256;
+
+ // aapt resource value: 0x7f01011f
+ public const int wheelview_textSize = 2130772255;
// aapt resource value: 0x7f010034
public const int windowActionBar = 2130772020;
@@ -2171,55 +2189,82 @@
public const int ic_gps_point = 2130837614;
// aapt resource value: 0x7f02006f
- public const int Icon = 2130837615;
+ public const int ic_wd_arc_scale_bg = 2130837615;
// aapt resource value: 0x7f020070
- public const int Loading = 2130837616;
+ public const int ic_wd_curtain_bg_top = 2130837616;
// aapt resource value: 0x7f020071
- public const int notification_action_background = 2130837617;
+ public const int ic_wd_curtain_h_bg = 2130837617;
// aapt resource value: 0x7f020072
- public const int notification_bg = 2130837618;
+ public const int ic_wd_curtain_h_open = 2130837618;
// aapt resource value: 0x7f020073
- public const int notification_bg_low = 2130837619;
+ public const int ic_wd_curtain_h_progress = 2130837619;
// aapt resource value: 0x7f020074
- public const int notification_bg_low_normal = 2130837620;
+ public const int ic_wd_curtain_h_top = 2130837620;
// aapt resource value: 0x7f020075
- public const int notification_bg_low_pressed = 2130837621;
+ public const int ic_wd_curtain_open = 2130837621;
// aapt resource value: 0x7f020076
- public const int notification_bg_normal = 2130837622;
+ public const int ic_wd_curtain_roll_bg = 2130837622;
// aapt resource value: 0x7f020077
- public const int notification_bg_normal_pressed = 2130837623;
+ public const int ic_wd_curtain_roll_progress = 2130837623;
// aapt resource value: 0x7f020078
- public const int notification_icon_background = 2130837624;
-
- // aapt resource value: 0x7f02007e
- public const int notification_template_icon_bg = 2130837630;
-
- // aapt resource value: 0x7f02007f
- public const int notification_template_icon_low_bg = 2130837631;
+ public const int Icon = 2130837624;
// aapt resource value: 0x7f020079
- public const int notification_tile_bg = 2130837625;
+ public const int Loading = 2130837625;
// aapt resource value: 0x7f02007a
- public const int notify_panel_notification_icon_bg = 2130837626;
+ public const int notification_action_background = 2130837626;
// aapt resource value: 0x7f02007b
- public const int selector_pickerview_btn = 2130837627;
+ public const int notification_bg = 2130837627;
// aapt resource value: 0x7f02007c
- public const int tooltip_frame_dark = 2130837628;
+ public const int notification_bg_low = 2130837628;
// aapt resource value: 0x7f02007d
- public const int tooltip_frame_light = 2130837629;
+ public const int notification_bg_low_normal = 2130837629;
+
+ // aapt resource value: 0x7f02007e
+ public const int notification_bg_low_pressed = 2130837630;
+
+ // aapt resource value: 0x7f02007f
+ public const int notification_bg_normal = 2130837631;
+
+ // aapt resource value: 0x7f020080
+ public const int notification_bg_normal_pressed = 2130837632;
+
+ // aapt resource value: 0x7f020081
+ public const int notification_icon_background = 2130837633;
+
+ // aapt resource value: 0x7f020087
+ public const int notification_template_icon_bg = 2130837639;
+
+ // aapt resource value: 0x7f020088
+ public const int notification_template_icon_low_bg = 2130837640;
+
+ // aapt resource value: 0x7f020082
+ public const int notification_tile_bg = 2130837634;
+
+ // aapt resource value: 0x7f020083
+ public const int notify_panel_notification_icon_bg = 2130837635;
+
+ // aapt resource value: 0x7f020084
+ public const int selector_pickerview_btn = 2130837636;
+
+ // aapt resource value: 0x7f020085
+ public const int tooltip_frame_dark = 2130837637;
+
+ // aapt resource value: 0x7f020086
+ public const int tooltip_frame_light = 2130837638;
static Drawable()
{
@@ -2870,82 +2915,85 @@
public const int hdl_widget_activity_geofence_round = 2130968606;
// aapt resource value: 0x7f04001f
- public const int hdl_widget_include_pickerview_topbar = 2130968607;
+ public const int hdl_widget_air_button = 2130968607;
// aapt resource value: 0x7f040020
- public const int hdl_widget_layout_basepickerview = 2130968608;
+ public const int hdl_widget_include_pickerview_topbar = 2130968608;
// aapt resource value: 0x7f040021
- public const int hdl_widget_pickerview = 2130968609;
+ public const int hdl_widget_layout_basepickerview = 2130968609;
// aapt resource value: 0x7f040022
- public const int hdl_widget_pickerview_options = 2130968610;
+ public const int hdl_widget_pickerview = 2130968610;
// aapt resource value: 0x7f040023
- public const int hdl_widget_pickerview_time = 2130968611;
+ public const int hdl_widget_pickerview_options = 2130968611;
// aapt resource value: 0x7f040024
- public const int Main = 2130968612;
+ public const int hdl_widget_pickerview_time = 2130968612;
// aapt resource value: 0x7f040025
- public const int notification_action = 2130968613;
+ public const int Main = 2130968613;
// aapt resource value: 0x7f040026
- public const int notification_action_tombstone = 2130968614;
+ public const int notification_action = 2130968614;
// aapt resource value: 0x7f040027
- public const int notification_media_action = 2130968615;
+ public const int notification_action_tombstone = 2130968615;
// aapt resource value: 0x7f040028
- public const int notification_media_cancel_action = 2130968616;
+ public const int notification_media_action = 2130968616;
// aapt resource value: 0x7f040029
- public const int notification_template_big_media = 2130968617;
+ public const int notification_media_cancel_action = 2130968617;
// aapt resource value: 0x7f04002a
- public const int notification_template_big_media_custom = 2130968618;
+ public const int notification_template_big_media = 2130968618;
// aapt resource value: 0x7f04002b
- public const int notification_template_big_media_narrow = 2130968619;
+ public const int notification_template_big_media_custom = 2130968619;
// aapt resource value: 0x7f04002c
- public const int notification_template_big_media_narrow_custom = 2130968620;
+ public const int notification_template_big_media_narrow = 2130968620;
// aapt resource value: 0x7f04002d
- public const int notification_template_custom_big = 2130968621;
+ public const int notification_template_big_media_narrow_custom = 2130968621;
// aapt resource value: 0x7f04002e
- public const int notification_template_icon_group = 2130968622;
+ public const int notification_template_custom_big = 2130968622;
// aapt resource value: 0x7f04002f
- public const int notification_template_lines_media = 2130968623;
+ public const int notification_template_icon_group = 2130968623;
// aapt resource value: 0x7f040030
- public const int notification_template_media = 2130968624;
+ public const int notification_template_lines_media = 2130968624;
// aapt resource value: 0x7f040031
- public const int notification_template_media_custom = 2130968625;
+ public const int notification_template_media = 2130968625;
// aapt resource value: 0x7f040032
- public const int notification_template_part_chronometer = 2130968626;
+ public const int notification_template_media_custom = 2130968626;
// aapt resource value: 0x7f040033
- public const int notification_template_part_time = 2130968627;
+ public const int notification_template_part_chronometer = 2130968627;
// aapt resource value: 0x7f040034
- public const int select_dialog_item_material = 2130968628;
+ public const int notification_template_part_time = 2130968628;
// aapt resource value: 0x7f040035
- public const int select_dialog_multichoice_material = 2130968629;
+ public const int select_dialog_item_material = 2130968629;
// aapt resource value: 0x7f040036
- public const int select_dialog_singlechoice_material = 2130968630;
+ public const int select_dialog_multichoice_material = 2130968630;
// aapt resource value: 0x7f040037
- public const int support_simple_spinner_dropdown_item = 2130968631;
+ public const int select_dialog_singlechoice_material = 2130968631;
// aapt resource value: 0x7f040038
- public const int tooltip = 2130968632;
+ public const int support_simple_spinner_dropdown_item = 2130968632;
+
+ // aapt resource value: 0x7f040039
+ public const int tooltip = 2130968633;
static Layout()
{
@@ -5248,13 +5296,39 @@
// aapt resource value: 14
public const int HDLArcSeekBar_hdl_arc_thumb_mode = 14;
- public static int[] HDLWaveSeekBar = new int[] {
+ public static int[] HDLCurtainSeekBar = new int[] {
2130772242,
2130772243,
2130772244,
2130772245,
2130772246,
2130772247};
+
+ // aapt resource value: 2
+ public const int HDLCurtainSeekBar_curtain_bar_bg_color = 2;
+
+ // aapt resource value: 3
+ public const int HDLCurtainSeekBar_curtain_bar_border_color = 3;
+
+ // aapt resource value: 0
+ public const int HDLCurtainSeekBar_curtain_bar_color = 0;
+
+ // aapt resource value: 5
+ public const int HDLCurtainSeekBar_curtain_bar_height = 5;
+
+ // aapt resource value: 4
+ public const int HDLCurtainSeekBar_curtain_bar_width = 4;
+
+ // aapt resource value: 1
+ public const int HDLCurtainSeekBar_second_curtain_bar_color = 1;
+
+ public static int[] HDLWaveSeekBar = new int[] {
+ 2130772248,
+ 2130772249,
+ 2130772250,
+ 2130772251,
+ 2130772252,
+ 2130772253};
// aapt resource value: 1
public const int HDLWaveSeekBar_second_wave_color = 1;
@@ -5901,12 +5975,12 @@
public const int ViewStubCompat_android_layout = 1;
public static int[] pickerview = new int[] {
- 2130772248,
- 2130772249,
- 2130772250,
- 2130772251,
- 2130772252,
- 2130772253};
+ 2130772254,
+ 2130772255,
+ 2130772256,
+ 2130772257,
+ 2130772258,
+ 2130772259};
// aapt resource value: 4
public const int pickerview_wheelview_dividerColor = 4;
--
Gitblit v1.8.0