Merge branch 'CJL-NEW'

wxr

2020-12-09 d60b92c58ac09197642eb6dac9b905f0898dacb8

 HDL-ON_Android/Resources/Resource.designer.cs

@@ -71,11 +71,11 @@
         global::Xamarin.Essentials.Resource.Drawable.notification_template_icon_low_bg = global::HDL_ON_Android.Resource.Drawable.notification_template_icon_low_bg;
         global::Xamarin.Essentials.Resource.Drawable.notification_tile_bg = global::HDL_ON_Android.Resource.Drawable.notification_tile_bg;
         global::Xamarin.Essentials.Resource.Drawable.notify_panel_notification_icon_bg = global::HDL_ON_Android.Resource.Drawable.notify_panel_notification_icon_bg;
         global::Xamarin.Essentials.Resource.Id.actions = global::HDL_ON_Android.Resource.Id.actions;
         global::Xamarin.Essentials.Resource.Id.action_container = global::HDL_ON_Android.Resource.Id.action_container;
         global::Xamarin.Essentials.Resource.Id.action_divider = global::HDL_ON_Android.Resource.Id.action_divider;
         global::Xamarin.Essentials.Resource.Id.action_image = global::HDL_ON_Android.Resource.Id.action_image;
         global::Xamarin.Essentials.Resource.Id.action_text = global::HDL_ON_Android.Resource.Id.action_text;
         global::Xamarin.Essentials.Resource.Id.actions = global::HDL_ON_Android.Resource.Id.actions;
         global::Xamarin.Essentials.Resource.Id.async = global::HDL_ON_Android.Resource.Id.async;
         global::Xamarin.Essentials.Resource.Id.blocking = global::HDL_ON_Android.Resource.Id.blocking;
         global::Xamarin.Essentials.Resource.Id.chronometer = global::HDL_ON_Android.Resource.Id.chronometer;
@@ -111,18 +111,18 @@
         global::Xamarin.Essentials.Resource.Style.TextAppearance_Compat_Notification_Title = global::HDL_ON_Android.Resource.Style.TextAppearance_Compat_Notification_Title;
         global::Xamarin.Essentials.Resource.Style.Widget_Compat_NotificationActionContainer = global::HDL_ON_Android.Resource.Style.Widget_Compat_NotificationActionContainer;
         global::Xamarin.Essentials.Resource.Style.Widget_Compat_NotificationActionText = global::HDL_ON_Android.Resource.Style.Widget_Compat_NotificationActionText;
         global::Xamarin.Essentials.Resource.Xml.xamarin_essentials_fileprovider_file_paths = global::HDL_ON_Android.Resource.Xml.xamarin_essentials_fileprovider_file_paths;
         global::Xamarin.Essentials.Resource.Styleable.FontFamily = global::HDL_ON_Android.Resource.Styleable.FontFamily;
         global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont;
         global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont_font = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont_font;
         global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont_fontStyle = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont_fontStyle;
         global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont_fontWeight = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont_fontWeight;
         global::Xamarin.Essentials.Resource.Styleable.FontFamily_fontProviderAuthority = global::HDL_ON_Android.Resource.Styleable.FontFamily_fontProviderAuthority;
         global::Xamarin.Essentials.Resource.Styleable.FontFamily_fontProviderCerts = global::HDL_ON_Android.Resource.Styleable.FontFamily_fontProviderCerts;
         global::Xamarin.Essentials.Resource.Styleable.FontFamily_fontProviderFetchStrategy = global::HDL_ON_Android.Resource.Styleable.FontFamily_fontProviderFetchStrategy;
         global::Xamarin.Essentials.Resource.Styleable.FontFamily_fontProviderFetchTimeout = global::HDL_ON_Android.Resource.Styleable.FontFamily_fontProviderFetchTimeout;
         global::Xamarin.Essentials.Resource.Styleable.FontFamily_fontProviderPackage = global::HDL_ON_Android.Resource.Styleable.FontFamily_fontProviderPackage;
         global::Xamarin.Essentials.Resource.Styleable.FontFamily_fontProviderQuery = global::HDL_ON_Android.Resource.Styleable.FontFamily_fontProviderQuery;
         global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont;
         global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont_font = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont_font;
         global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont_fontStyle = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont_fontStyle;
         global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont_fontWeight = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont_fontWeight;
         global::Xamarin.Essentials.Resource.Xml.xamarin_essentials_fileprovider_file_paths = global::HDL_ON_Android.Resource.Xml.xamarin_essentials_fileprovider_file_paths;
         global::ZXing.Mobile.Resource.Id.contentFrame = global::HDL_ON_Android.Resource.Id.contentFrame;
         global::ZXing.Mobile.Resource.Layout.zxingscanneractivitylayout = global::HDL_ON_Android.Resource.Layout.zxingscanneractivitylayout;
         global::ZXing.Mobile.Resource.Layout.zxingscannerfragmentlayout = global::HDL_ON_Android.Resource.Layout.zxingscannerfragmentlayout;