From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001 From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local> Date: 星期四, 02 一月 2020 19:51:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC --- ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs index 4d98be1..3082e05 100644 --- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs +++ b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs @@ -3186,8 +3186,8 @@ // aapt resource value: 0x7f090099 public const int container = 2131296409; - // aapt resource value: 0x7f0900e1 - public const int contentFrame = 2131296481; + // aapt resource value: 0x7f0900e4 + public const int contentFrame = 2131296484; // aapt resource value: 0x7f090063 public const int contentPanel = 2131296355; @@ -3375,8 +3375,8 @@ // aapt resource value: 0x7f09005e public const int list_item = 2131296350; - // aapt resource value: 0x7f0900e3 - public const int masked = 2131296483; + // aapt resource value: 0x7f0900e6 + public const int masked = 2131296486; // aapt resource value: 0x7f0900ce public const int media_actions = 2131296462; @@ -3657,6 +3657,15 @@ // aapt resource value: 0x7f0900b4 public const int tvTitle = 2131296436; + // aapt resource value: 0x7f0900e2 + public const int tv_zxing_back = 2131296482; + + // aapt resource value: 0x7f0900e3 + public const int tv_zxing_flash = 2131296483; + + // aapt resource value: 0x7f0900e1 + public const int tv_zxing_scan = 2131296481; + // aapt resource value: 0x7f090022 public const int uniform = 2131296290; @@ -3669,8 +3678,8 @@ // aapt resource value: 0x7f09000c public const int view_offset_helper = 2131296268; - // aapt resource value: 0x7f0900e2 - public const int visible = 2131296482; + // aapt resource value: 0x7f0900e5 + public const int visible = 2131296485; // aapt resource value: 0x7f090031 public const int withText = 2131296305; @@ -3966,10 +3975,13 @@ public const int tooltip = 2130968650; // aapt resource value: 0x7f04004b - public const int zxingscanneractivitylayout = 2130968651; + public const int zxing_layout = 2130968651; // aapt resource value: 0x7f04004c - public const int zxingscannerfragmentlayout = 2130968652; + public const int zxingscanneractivitylayout = 2130968652; + + // aapt resource value: 0x7f04004d + public const int zxingscannerfragmentlayout = 2130968653; static Layout() { -- Gitblit v1.8.0