From db12561619d55f7b5214bcf03220cb7faf6815fe Mon Sep 17 00:00:00 2001
From: Redth <jondick@gmail.com>
Date: Fri, 2 Nov 2018 15:14:38 -0400
Subject: [PATCH 01/43] Rename AppInfo.OpenSettings -> ShowSettingsUI

Fixes #567
---
 Samples/Samples/View/AppInfoPage.xaml                  | 2 +-
 Samples/Samples/ViewModel/AppInfoViewModel.cs          | 4 ++--
 Xamarin.Essentials/AppInfo/AppInfo.android.cs          | 2 +-
 Xamarin.Essentials/AppInfo/AppInfo.ios.cs              | 2 +-
 Xamarin.Essentials/AppInfo/AppInfo.netstandard.cs      | 2 +-
 Xamarin.Essentials/AppInfo/AppInfo.shared.cs           | 6 ++----
 Xamarin.Essentials/AppInfo/AppInfo.uwp.cs              | 2 +-
 docs/en/FrameworksIndex/xamarin-essentials-android.xml | 2 +-
 docs/en/FrameworksIndex/xamarin-essentials-uwp.xml     | 2 +-
 docs/en/FrameworksIndex/xamarin-essentials.xml         | 2 +-
 docs/en/Xamarin.Essentials/AppInfo.xml                 | 8 ++++----
 11 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/Samples/Samples/View/AppInfoPage.xaml b/Samples/Samples/View/AppInfoPage.xaml
index 0fed904e0..50e4e87df 100644
--- a/Samples/Samples/View/AppInfoPage.xaml
+++ b/Samples/Samples/View/AppInfoPage.xaml
@@ -21,7 +21,7 @@
                 <Label Text="{Binding AppVersion, StringFormat='Version: {0}'}" />
                 <Label Text="{Binding AppBuild, StringFormat='Build: {0}'}" />
 
-                <Button Text="Open Settings" Command="{Binding OpenSettingsCommand}"/>
+                <Button Text="Open Settings" Command="{Binding ShowSettingsUICommand}"/>
             </StackLayout>
         </ScrollView>
     </StackLayout>
diff --git a/Samples/Samples/ViewModel/AppInfoViewModel.cs b/Samples/Samples/ViewModel/AppInfoViewModel.cs
index 4fd33a13b..e32ead06a 100644
--- a/Samples/Samples/ViewModel/AppInfoViewModel.cs
+++ b/Samples/Samples/ViewModel/AppInfoViewModel.cs
@@ -13,11 +13,11 @@ public class AppInfoViewModel : BaseViewModel
 
         public string AppBuild => AppInfo.BuildString;
 
-        public Command OpenSettingsCommand { get; }
+        public Command ShowSettingsUICommand { get; }
 
         public AppInfoViewModel()
         {
-            OpenSettingsCommand = new Command(() => AppInfo.OpenSettings());
+            ShowSettingsUICommand = new Command(() => AppInfo.ShowSettingsUI());
         }
     }
 }
diff --git a/Xamarin.Essentials/AppInfo/AppInfo.android.cs b/Xamarin.Essentials/AppInfo/AppInfo.android.cs
index 7c7d316e6..e9a794ffc 100644
--- a/Xamarin.Essentials/AppInfo/AppInfo.android.cs
+++ b/Xamarin.Essentials/AppInfo/AppInfo.android.cs
@@ -35,7 +35,7 @@ static string PlatformGetBuild()
             }
         }
 
-        static void PlatformOpenSettings()
+        static void PlatformShowSettingsUI()
         {
             var context = Platform.GetCurrentActivity(false) ?? Platform.AppContext;
 
diff --git a/Xamarin.Essentials/AppInfo/AppInfo.ios.cs b/Xamarin.Essentials/AppInfo/AppInfo.ios.cs
index 48da0c5b9..98edf50ff 100644
--- a/Xamarin.Essentials/AppInfo/AppInfo.ios.cs
+++ b/Xamarin.Essentials/AppInfo/AppInfo.ios.cs
@@ -16,7 +16,7 @@ public static partial class AppInfo
         static string GetBundleValue(string key)
            => NSBundle.MainBundle.ObjectForInfoDictionary(key)?.ToString();
 
-        static void PlatformOpenSettings() =>
+        static void PlatformShowSettingsUI() =>
             UIApplication.SharedApplication.OpenUrl(new NSUrl(UIApplication.OpenSettingsUrlString));
     }
 }
diff --git a/Xamarin.Essentials/AppInfo/AppInfo.netstandard.cs b/Xamarin.Essentials/AppInfo/AppInfo.netstandard.cs
index e9b606d30..bce6a01a5 100644
--- a/Xamarin.Essentials/AppInfo/AppInfo.netstandard.cs
+++ b/Xamarin.Essentials/AppInfo/AppInfo.netstandard.cs
@@ -10,6 +10,6 @@ public static partial class AppInfo
 
         static string PlatformGetBuild() => throw new NotImplementedInReferenceAssemblyException();
 
-        static void PlatformOpenSettings() => throw new NotImplementedInReferenceAssemblyException();
+        static void PlatformShowSettingsUI() => throw new NotImplementedInReferenceAssemblyException();
     }
 }
diff --git a/Xamarin.Essentials/AppInfo/AppInfo.shared.cs b/Xamarin.Essentials/AppInfo/AppInfo.shared.cs
index 6856d3c4f..631f2c487 100644
--- a/Xamarin.Essentials/AppInfo/AppInfo.shared.cs
+++ b/Xamarin.Essentials/AppInfo/AppInfo.shared.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Xamarin.Essentials
+namespace Xamarin.Essentials
 {
     public static partial class AppInfo
     {
@@ -14,6 +12,6 @@ public static partial class AppInfo
 
         public static string BuildString => PlatformGetBuild();
 
-        public static void OpenSettings() => PlatformOpenSettings();
+        public static void ShowSettingsUI() => PlatformShowSettingsUI();
     }
 }
diff --git a/Xamarin.Essentials/AppInfo/AppInfo.uwp.cs b/Xamarin.Essentials/AppInfo/AppInfo.uwp.cs
index 86b473492..b92df8525 100644
--- a/Xamarin.Essentials/AppInfo/AppInfo.uwp.cs
+++ b/Xamarin.Essentials/AppInfo/AppInfo.uwp.cs
@@ -18,7 +18,7 @@ static string PlatformGetVersionString()
         static string PlatformGetBuild() =>
             Package.Current.Id.Version.Build.ToString(CultureInfo.InvariantCulture);
 
-        static void PlatformOpenSettings() =>
+        static void PlatformShowSettingsUI() =>
             Windows.System.Launcher.LaunchUriAsync(new System.Uri("ms-settings:appsfeatures-app")).WatchForError();
     }
 }
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-android.xml b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
index c10edad15..cf33dd2da 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-android.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
@@ -19,7 +19,7 @@
       <Member Id="P:Xamarin.Essentials.AccelerometerData.Acceleration" />
     </Type>
     <Type Name="Xamarin.Essentials.AppInfo" Id="T:Xamarin.Essentials.AppInfo">
-      <Member Id="M:Xamarin.Essentials.AppInfo.OpenSettings" />
+      <Member Id="M:Xamarin.Essentials.AppInfo.ShowSettingsUI" />
       <Member Id="P:Xamarin.Essentials.AppInfo.BuildString" />
       <Member Id="P:Xamarin.Essentials.AppInfo.Name" />
       <Member Id="P:Xamarin.Essentials.AppInfo.PackageName" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
index bbdc5414e..09dcad344 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
@@ -19,7 +19,7 @@
       <Member Id="P:Xamarin.Essentials.AccelerometerData.Acceleration" />
     </Type>
     <Type Name="Xamarin.Essentials.AppInfo" Id="T:Xamarin.Essentials.AppInfo">
-      <Member Id="M:Xamarin.Essentials.AppInfo.OpenSettings" />
+      <Member Id="M:Xamarin.Essentials.AppInfo.ShowSettingsUI" />
       <Member Id="P:Xamarin.Essentials.AppInfo.BuildString" />
       <Member Id="P:Xamarin.Essentials.AppInfo.Name" />
       <Member Id="P:Xamarin.Essentials.AppInfo.PackageName" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials.xml b/docs/en/FrameworksIndex/xamarin-essentials.xml
index dd095f9c8..49195f6de 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials.xml
@@ -19,7 +19,7 @@
       <Member Id="P:Xamarin.Essentials.AccelerometerData.Acceleration" />
     </Type>
     <Type Name="Xamarin.Essentials.AppInfo" Id="T:Xamarin.Essentials.AppInfo">
-      <Member Id="M:Xamarin.Essentials.AppInfo.OpenSettings" />
+      <Member Id="M:Xamarin.Essentials.AppInfo.ShowSettingsUI" />
       <Member Id="P:Xamarin.Essentials.AppInfo.BuildString" />
       <Member Id="P:Xamarin.Essentials.AppInfo.Name" />
       <Member Id="P:Xamarin.Essentials.AppInfo.PackageName" />
diff --git a/docs/en/Xamarin.Essentials/AppInfo.xml b/docs/en/Xamarin.Essentials/AppInfo.xml
index bf61d722f..51e0c89da 100644
--- a/docs/en/Xamarin.Essentials/AppInfo.xml
+++ b/docs/en/Xamarin.Essentials/AppInfo.xml
@@ -53,10 +53,10 @@
         <remarks></remarks>
       </Docs>
     </Member>
-    <Member MemberName="OpenSettings">
-      <MemberSignature Language="C#" Value="public static void OpenSettings ();" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig void OpenSettings() cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.AppInfo.OpenSettings" />
+    <Member MemberName="ShowSettingsUI">
+      <MemberSignature Language="C#" Value="public static void ShowSettingsUI ();" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig void ShowSettingsUI() cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.AppInfo.ShowSettingsUI" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>

From 34c262bb1ff58c3a1a12e9650cfe17c4dbd6ffa8 Mon Sep 17 00:00:00 2001
From: Jonathan Dick <jondick@gmail.com>
Date: Fri, 2 Nov 2018 15:39:17 -0400
Subject: [PATCH 02/43] Missed one docs rename

---
 docs/en/FrameworksIndex/xamarin-essentials-ios.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
index 0c6ff4aee..2412c1c85 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
@@ -19,7 +19,7 @@
       <Member Id="P:Xamarin.Essentials.AccelerometerData.Acceleration" />
     </Type>
     <Type Name="Xamarin.Essentials.AppInfo" Id="T:Xamarin.Essentials.AppInfo">
-      <Member Id="M:Xamarin.Essentials.AppInfo.OpenSettings" />
+      <Member Id="M:Xamarin.Essentials.AppInfo.ShowSettingsUI" />
       <Member Id="P:Xamarin.Essentials.AppInfo.BuildString" />
       <Member Id="P:Xamarin.Essentials.AppInfo.Name" />
       <Member Id="P:Xamarin.Essentials.AppInfo.PackageName" />

From 0a46328512c7c36632ae7f308e482d47d7466833 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Fri, 2 Nov 2018 21:53:12 +0200
Subject: [PATCH 03/43] Added back a missing using.

---
 Xamarin.Essentials/AppInfo/AppInfo.shared.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Xamarin.Essentials/AppInfo/AppInfo.shared.cs b/Xamarin.Essentials/AppInfo/AppInfo.shared.cs
index 631f2c487..ecbe60ec2 100644
--- a/Xamarin.Essentials/AppInfo/AppInfo.shared.cs
+++ b/Xamarin.Essentials/AppInfo/AppInfo.shared.cs
@@ -1,4 +1,6 @@
-namespace Xamarin.Essentials
+using System;
+
+namespace Xamarin.Essentials
 {
     public static partial class AppInfo
     {

From d3939572f836f49d73722f6287cc039b5a84d393 Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Fri, 2 Nov 2018 15:24:35 -0700
Subject: [PATCH 04/43] Fixed up Clipboard API! Updated everything
 SetTextAsync. Update xunit test runners

---
 .../DeviceTests.Android/DeviceTests.Android.csproj |  6 +++---
 DeviceTests/DeviceTests.Shared/Clipboard_Tests.cs  |  7 ++-----
 .../DeviceTests.Shared/DeviceTests.Shared.csproj   | 10 +++++-----
 DeviceTests/DeviceTests.UWP/DeviceTests.UWP.csproj |  8 ++++----
 DeviceTests/DeviceTests.iOS/DeviceTests.iOS.csproj |  6 +++---
 Samples/Samples.Android/Samples.Android.csproj     |  2 +-
 Samples/Samples.UWP/Samples.UWP.csproj             |  2 +-
 Samples/Samples.iOS/Samples.iOS.csproj             |  2 +-
 Samples/Samples/Samples.csproj                     |  2 +-
 Samples/Samples/ViewModel/ClipboardViewModel.cs    |  2 +-
 Tests/Clipboard_Tests.cs                           | 14 ++++----------
 Tests/Tests.csproj                                 |  7 +++++--
 Xamarin.Essentials/Clipboard/Clipboard.android.cs  |  7 +++++--
 Xamarin.Essentials/Clipboard/Clipboard.ios.cs      |  7 +++++--
 .../Clipboard/Clipboard.netstandard.cs             |  2 +-
 Xamarin.Essentials/Clipboard/Clipboard.shared.cs   |  7 +++----
 Xamarin.Essentials/Clipboard/Clipboard.uwp.cs      | 11 ++++++-----
 Xamarin.Essentials/Xamarin.Essentials.csproj       |  2 +-
 .../FrameworksIndex/xamarin-essentials-android.xml |  2 +-
 docs/en/FrameworksIndex/xamarin-essentials-ios.xml |  2 +-
 docs/en/FrameworksIndex/xamarin-essentials-uwp.xml |  2 +-
 docs/en/FrameworksIndex/xamarin-essentials.xml     |  2 +-
 docs/en/Xamarin.Essentials/Clipboard.xml           |  8 ++++----
 23 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/DeviceTests/DeviceTests.Android/DeviceTests.Android.csproj b/DeviceTests/DeviceTests.Android/DeviceTests.Android.csproj
index d3f02f833..4ba92430f 100644
--- a/DeviceTests/DeviceTests.Android/DeviceTests.Android.csproj
+++ b/DeviceTests/DeviceTests.Android/DeviceTests.Android.csproj
@@ -65,7 +65,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
+    <PackageReference Include="Xamarin.Forms" Version="3.3.0.967583" />
     <PackageReference Include="Xamarin.Android.Support.Design" Version="27.0.2.1" />
     <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="27.0.2.1" />
     <PackageReference Include="Xamarin.Android.Support.v4" Version="27.0.2.1" />
@@ -74,8 +74,8 @@
     <PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="27.0.2.1" />
     <PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="27.0.2.1" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.devices" Version="2.4.48" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.devices" Version="2.5.20" />
     <PackageReference Include="UnitTests.HeadlessRunner" Version="2.0.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/DeviceTests/DeviceTests.Shared/Clipboard_Tests.cs b/DeviceTests/DeviceTests.Shared/Clipboard_Tests.cs
index 0bfac6b0e..83ae4dd8e 100644
--- a/DeviceTests/DeviceTests.Shared/Clipboard_Tests.cs
+++ b/DeviceTests/DeviceTests.Shared/Clipboard_Tests.cs
@@ -13,10 +13,7 @@ public Task Set_Clipboard_Values(string text)
         {
             return Utils.OnMainThread(async () =>
             {
-                Clipboard.SetText(text);
-
-                await Task.Delay(100);
-
+                await Clipboard.SetTextAsync(text);
                 Assert.True(Clipboard.HasText);
             });
         }
@@ -28,7 +25,7 @@ public Task Get_Clipboard_Values(string text)
         {
             return Utils.OnMainThread(async () =>
             {
-                Clipboard.SetText(text);
+                await Clipboard.SetTextAsync(text);
                 var clipText = await Clipboard.GetTextAsync();
 
                 Assert.NotNull(clipText);
diff --git a/DeviceTests/DeviceTests.Shared/DeviceTests.Shared.csproj b/DeviceTests/DeviceTests.Shared/DeviceTests.Shared.csproj
index 045176e6a..cca493622 100644
--- a/DeviceTests/DeviceTests.Shared/DeviceTests.Shared.csproj
+++ b/DeviceTests/DeviceTests.Shared/DeviceTests.Shared.csproj
@@ -29,17 +29,17 @@
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.60" PrivateAssets="All" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
-    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.devices" Version="2.4.48" />
+    <PackageReference Include="Xamarin.Forms" Version="3.3.0.967583" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.devices" Version="2.5.20" />
     <PackageReference Include="UnitTests.HeadlessRunner" Version="2.0.0" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     <ProjectReference Include="..\..\Xamarin.Essentials\Xamarin.Essentials.csproj" />
   </ItemGroup>
   <ItemGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) ">
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.5" />
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.9" />
     <SDKReference Include="WindowsMobile, Version=10.0.16299.0">
       <Name>Windows Mobile Extensions for the UWP</Name>
     </SDKReference>
diff --git a/DeviceTests/DeviceTests.UWP/DeviceTests.UWP.csproj b/DeviceTests/DeviceTests.UWP/DeviceTests.UWP.csproj
index ea181c333..e3b159ed4 100644
--- a/DeviceTests/DeviceTests.UWP/DeviceTests.UWP.csproj
+++ b/DeviceTests/DeviceTests.UWP/DeviceTests.UWP.csproj
@@ -127,10 +127,10 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="UnitTests.HeadlessRunner" Version="2.0.0" />
-    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.5" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.devices" Version="2.4.48" />
+    <PackageReference Include="Xamarin.Forms" Version="3.3.0.967583" />
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.9" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.devices" Version="2.5.20" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/DeviceTests/DeviceTests.iOS/DeviceTests.iOS.csproj b/DeviceTests/DeviceTests.iOS/DeviceTests.iOS.csproj
index bd81986ae..27923203a 100644
--- a/DeviceTests/DeviceTests.iOS/DeviceTests.iOS.csproj
+++ b/DeviceTests/DeviceTests.iOS/DeviceTests.iOS.csproj
@@ -110,9 +110,9 @@
     <Reference Include="Xamarin.iOS" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.devices" Version="2.4.48" />
+    <PackageReference Include="Xamarin.Forms" Version="3.3.0.967583" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.devices" Version="2.5.20" />
     <PackageReference Include="UnitTests.HeadlessRunner" Version="2.0.0" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
   </ItemGroup>
diff --git a/Samples/Samples.Android/Samples.Android.csproj b/Samples/Samples.Android/Samples.Android.csproj
index b3bf5896d..fb630c60f 100644
--- a/Samples/Samples.Android/Samples.Android.csproj
+++ b/Samples/Samples.Android/Samples.Android.csproj
@@ -86,7 +86,7 @@
     <PackageReference Include="Microsoft.AppCenter.Distribute">
       <Version>1.10.0</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
+    <PackageReference Include="Xamarin.Forms" Version="3.3.0.967583" />
     <PackageReference Include="Xamarin.Android.Support.Design" Version="27.0.2.1" />
     <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="27.0.2.1" />
     <PackageReference Include="Xamarin.Android.Support.v4" Version="27.0.2.1" />
diff --git a/Samples/Samples.UWP/Samples.UWP.csproj b/Samples/Samples.UWP/Samples.UWP.csproj
index 891d03dc1..5bda58f75 100644
--- a/Samples/Samples.UWP/Samples.UWP.csproj
+++ b/Samples/Samples.UWP/Samples.UWP.csproj
@@ -138,7 +138,7 @@
     <PackageReference Include="Microsoft.AppCenter.Distribute">
       <Version>1.10.0</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
+    <PackageReference Include="Xamarin.Forms" Version="3.3.0.967583" />
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.5" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
   </ItemGroup>
diff --git a/Samples/Samples.iOS/Samples.iOS.csproj b/Samples/Samples.iOS/Samples.iOS.csproj
index f0d2a0d26..7221ab237 100644
--- a/Samples/Samples.iOS/Samples.iOS.csproj
+++ b/Samples/Samples.iOS/Samples.iOS.csproj
@@ -110,7 +110,7 @@
     <PackageReference Include="Microsoft.AppCenter.Distribute">
       <Version>1.10.0</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
+    <PackageReference Include="Xamarin.Forms" Version="3.3.0.967583" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Samples/Samples/Samples.csproj b/Samples/Samples/Samples.csproj
index 7f9d31395..ed3c1829a 100644
--- a/Samples/Samples/Samples.csproj
+++ b/Samples/Samples/Samples.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.AppCenter.Analytics" Version="1.10.0" />
     <PackageReference Include="Microsoft.AppCenter.Crashes" Version="1.10.0" />
     <PackageReference Include="Microsoft.AppCenter.Distribute" Version="1.10.0" />
-    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
+    <PackageReference Include="Xamarin.Forms" Version="3.3.0.967583" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
   </ItemGroup>
 
diff --git a/Samples/Samples/ViewModel/ClipboardViewModel.cs b/Samples/Samples/ViewModel/ClipboardViewModel.cs
index d619148d5..73dc02a0e 100644
--- a/Samples/Samples/ViewModel/ClipboardViewModel.cs
+++ b/Samples/Samples/ViewModel/ClipboardViewModel.cs
@@ -24,7 +24,7 @@ public string FieldValue
             set => SetProperty(ref fieldValue, value);
         }
 
-        void OnCopy() => Clipboard.SetText(FieldValue);
+        async void OnCopy() => await Clipboard.SetTextAsync(FieldValue);
 
         async void OnPaste()
         {
diff --git a/Tests/Clipboard_Tests.cs b/Tests/Clipboard_Tests.cs
index 80ded8c41..bbca653c7 100644
--- a/Tests/Clipboard_Tests.cs
+++ b/Tests/Clipboard_Tests.cs
@@ -7,21 +7,15 @@ namespace Tests
     public class Clipboard_Tests
     {
         [Fact]
-        public void Clipboard_SetText_Fail_On_NetStandard()
-        {
-            Assert.Throws<NotImplementedInReferenceAssemblyException>(() => Clipboard.SetText("Text"));
-        }
+        public async Task Clipboard_SetText_Fail_On_NetStandard() =>
+            await Assert.ThrowsAsync<NotImplementedInReferenceAssemblyException>(() => Clipboard.SetTextAsync("Text"));
 
         [Fact]
-        public void Clipboard_HasText_Fail_On_NetStandard()
-        {
+        public void Clipboard_HasText_Fail_On_NetStandard() =>
             Assert.Throws<NotImplementedInReferenceAssemblyException>(() => Clipboard.HasText);
-        }
 
         [Fact]
-        public async Task Clipboard_GetText_Fail_On_NetStandard()
-        {
+        public async Task Clipboard_GetText_Fail_On_NetStandard() =>
             await Assert.ThrowsAsync<NotImplementedInReferenceAssemblyException>(() => Clipboard.GetTextAsync());
-        }
     }
 }
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 01460134a..d312b16f0 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -9,8 +9,11 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 
diff --git a/Xamarin.Essentials/Clipboard/Clipboard.android.cs b/Xamarin.Essentials/Clipboard/Clipboard.android.cs
index 2540d7e98..7d8acecb7 100644
--- a/Xamarin.Essentials/Clipboard/Clipboard.android.cs
+++ b/Xamarin.Essentials/Clipboard/Clipboard.android.cs
@@ -5,8 +5,11 @@ namespace Xamarin.Essentials
 {
     public static partial class Clipboard
     {
-        static void PlatformSetText(string text)
-            => Platform.ClipboardManager.PrimaryClip = ClipData.NewPlainText("Text", text);
+        static Task PlatformSetTextAsync(string text)
+        {
+            Platform.ClipboardManager.PrimaryClip = ClipData.NewPlainText("Text", text);
+            return Task.CompletedTask;
+        }
 
         static bool PlatformHasText
             => Platform.ClipboardManager.HasPrimaryClip;
diff --git a/Xamarin.Essentials/Clipboard/Clipboard.ios.cs b/Xamarin.Essentials/Clipboard/Clipboard.ios.cs
index ed5a77c26..569021e47 100644
--- a/Xamarin.Essentials/Clipboard/Clipboard.ios.cs
+++ b/Xamarin.Essentials/Clipboard/Clipboard.ios.cs
@@ -5,8 +5,11 @@ namespace Xamarin.Essentials
 {
     public static partial class Clipboard
     {
-        static void PlatformSetText(string text)
-            => UIPasteboard.General.String = text;
+        static Task PlatformSetTextAsync(string text)
+        {
+            UIPasteboard.General.String = text;
+            return Task.CompletedTask;
+        }
 
         static bool PlatformHasText
             => UIPasteboard.General.HasStrings;
diff --git a/Xamarin.Essentials/Clipboard/Clipboard.netstandard.cs b/Xamarin.Essentials/Clipboard/Clipboard.netstandard.cs
index 2965fb456..7c2d4cd6c 100644
--- a/Xamarin.Essentials/Clipboard/Clipboard.netstandard.cs
+++ b/Xamarin.Essentials/Clipboard/Clipboard.netstandard.cs
@@ -4,7 +4,7 @@ namespace Xamarin.Essentials
 {
     public static partial class Clipboard
     {
-        static void PlatformSetText(string text)
+        static Task PlatformSetTextAsync(string text)
             => throw new NotImplementedInReferenceAssemblyException();
 
         static bool PlatformHasText
diff --git a/Xamarin.Essentials/Clipboard/Clipboard.shared.cs b/Xamarin.Essentials/Clipboard/Clipboard.shared.cs
index 20ac4d25f..a490949de 100644
--- a/Xamarin.Essentials/Clipboard/Clipboard.shared.cs
+++ b/Xamarin.Essentials/Clipboard/Clipboard.shared.cs
@@ -1,12 +1,11 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
 namespace Xamarin.Essentials
 {
     public static partial class Clipboard
     {
-        public static void SetText(string text)
-            => PlatformSetText(text);
+        public static Task SetTextAsync(string text)
+            => PlatformSetTextAsync(text);
 
         public static bool HasText
             => PlatformHasText;
diff --git a/Xamarin.Essentials/Clipboard/Clipboard.uwp.cs b/Xamarin.Essentials/Clipboard/Clipboard.uwp.cs
index 5730fbca2..9678a3476 100644
--- a/Xamarin.Essentials/Clipboard/Clipboard.uwp.cs
+++ b/Xamarin.Essentials/Clipboard/Clipboard.uwp.cs
@@ -2,25 +2,26 @@
 using System.Threading.Tasks;
 using Windows.ApplicationModel.DataTransfer;
 
-using static Windows.ApplicationModel.DataTransfer.Clipboard;
+using WindowsClipboard = Windows.ApplicationModel.DataTransfer.Clipboard;
 
 namespace Xamarin.Essentials
 {
     public static partial class Clipboard
     {
-        static void PlatformSetText(string text)
+        static Task PlatformSetTextAsync(string text)
         {
             var dataPackage = new DataPackage();
             dataPackage.SetText(text);
-            SetContent(dataPackage);
+            WindowsClipboard.SetContent(dataPackage);
+            return Task.CompletedTask;
         }
 
         static bool PlatformHasText
-            => GetContent().Contains(StandardDataFormats.Text);
+            => WindowsClipboard.GetContent().Contains(StandardDataFormats.Text);
 
         static Task<string> PlatformGetTextAsync()
         {
-            var clipboardContent = GetContent();
+            var clipboardContent = WindowsClipboard.GetContent();
             return clipboardContent.Contains(StandardDataFormats.Text)
                 ? clipboardContent.GetTextAsync().AsTask()
                 : Task.FromResult<string>(null);
diff --git a/Xamarin.Essentials/Xamarin.Essentials.csproj b/Xamarin.Essentials/Xamarin.Essentials.csproj
index bf7f8741f..3587d7d15 100644
--- a/Xamarin.Essentials/Xamarin.Essentials.csproj
+++ b/Xamarin.Essentials/Xamarin.Essentials.csproj
@@ -55,7 +55,7 @@
   <ItemGroup>
     <None Include="..\nugetreadme.txt" PackagePath="readme.txt" Pack="true" />
     <PackageReference Include="mdoc" Version="5.7.4" PrivateAssets="All" />
-    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.60" PrivateAssets="All" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     <Compile Include="**\*.shared.cs" />
     <Compile Include="**\*.shared.*.cs" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-android.xml b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
index cf33dd2da..12895551b 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-android.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
@@ -83,7 +83,7 @@
     </Type>
     <Type Name="Xamarin.Essentials.Clipboard" Id="T:Xamarin.Essentials.Clipboard">
       <Member Id="M:Xamarin.Essentials.Clipboard.GetTextAsync" />
-      <Member Id="M:Xamarin.Essentials.Clipboard.SetText(System.String)" />
+      <Member Id="M:Xamarin.Essentials.Clipboard.SetTextAsync(System.String)" />
       <Member Id="P:Xamarin.Essentials.Clipboard.HasText" />
     </Type>
     <Type Name="Xamarin.Essentials.Compass" Id="T:Xamarin.Essentials.Compass">
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
index 2412c1c85..4132f87a1 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
@@ -83,7 +83,7 @@
     </Type>
     <Type Name="Xamarin.Essentials.Clipboard" Id="T:Xamarin.Essentials.Clipboard">
       <Member Id="M:Xamarin.Essentials.Clipboard.GetTextAsync" />
-      <Member Id="M:Xamarin.Essentials.Clipboard.SetText(System.String)" />
+      <Member Id="M:Xamarin.Essentials.Clipboard.SetTextAsync(System.String)" />
       <Member Id="P:Xamarin.Essentials.Clipboard.HasText" />
     </Type>
     <Type Name="Xamarin.Essentials.Compass" Id="T:Xamarin.Essentials.Compass">
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
index 09dcad344..6624dfea1 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
@@ -83,7 +83,7 @@
     </Type>
     <Type Name="Xamarin.Essentials.Clipboard" Id="T:Xamarin.Essentials.Clipboard">
       <Member Id="M:Xamarin.Essentials.Clipboard.GetTextAsync" />
-      <Member Id="M:Xamarin.Essentials.Clipboard.SetText(System.String)" />
+      <Member Id="M:Xamarin.Essentials.Clipboard.SetTextAsync(System.String)" />
       <Member Id="P:Xamarin.Essentials.Clipboard.HasText" />
     </Type>
     <Type Name="Xamarin.Essentials.Compass" Id="T:Xamarin.Essentials.Compass">
diff --git a/docs/en/FrameworksIndex/xamarin-essentials.xml b/docs/en/FrameworksIndex/xamarin-essentials.xml
index 49195f6de..82ae43183 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials.xml
@@ -83,7 +83,7 @@
     </Type>
     <Type Name="Xamarin.Essentials.Clipboard" Id="T:Xamarin.Essentials.Clipboard">
       <Member Id="M:Xamarin.Essentials.Clipboard.GetTextAsync" />
-      <Member Id="M:Xamarin.Essentials.Clipboard.SetText(System.String)" />
+      <Member Id="M:Xamarin.Essentials.Clipboard.SetTextAsync(System.String)" />
       <Member Id="P:Xamarin.Essentials.Clipboard.HasText" />
     </Type>
     <Type Name="Xamarin.Essentials.Compass" Id="T:Xamarin.Essentials.Compass">
diff --git a/docs/en/Xamarin.Essentials/Clipboard.xml b/docs/en/Xamarin.Essentials/Clipboard.xml
index 11a0719ad..c594f4454 100644
--- a/docs/en/Xamarin.Essentials/Clipboard.xml
+++ b/docs/en/Xamarin.Essentials/Clipboard.xml
@@ -61,16 +61,16 @@
       </Docs>
     </Member>
     <Member MemberName="SetText">
-      <MemberSignature Language="C#" Value="public static void SetText (string text);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig void SetText(string text) cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Clipboard.SetText(System.String)" />
+      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task SetTextAsync (string text);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig System.Threading.Tasks.Task SetTextAsync(string text) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Clipboard.SetTextAsync(System.String)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
+        <ReturnType>System.Threading.Tasks.Task</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="text" Type="System.String" />

From 32e0d14792760a558db9c2f997e36e3d9fd2ef63 Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Fri, 2 Nov 2018 15:43:22 -0700
Subject: [PATCH 05/43] Updates Connectivity APIs from the review! got rid of
 Other made it unknown, removed WiMAX and updated Profiles to
 ConnectionProfiles

---
 .../DeviceTests.Shared/Connectivity_Tests.cs  |  4 +-
 Samples/Samples/View/ConnectivityPage.xaml    |  2 +-
 .../ViewModel/ConnectivityViewModel.cs        |  6 +-
 Tests/Connectivity_Tests.cs                   |  4 +-
 .../Connectivity/Connectivity.android.cs      | 17 +++---
 .../Connectivity/Connectivity.ios.cs          |  4 +-
 .../Connectivity/Connectivity.netstandard.cs  |  2 +-
 .../Connectivity/Connectivity.shared.cs       | 16 ++---
 .../Connectivity/Connectivity.shared.enums.cs | 11 ++--
 .../Connectivity/Connectivity.uwp.cs          |  4 +-
 .../xamarin-essentials-android.xml            |  7 +--
 .../xamarin-essentials-ios.xml                |  7 +--
 .../xamarin-essentials-uwp.xml                |  7 +--
 .../en/FrameworksIndex/xamarin-essentials.xml |  7 +--
 .../Xamarin.Essentials/ConnectionProfile.xml  | 59 +++++++------------
 docs/en/Xamarin.Essentials/Connectivity.xml   |  8 +--
 .../ConnectivityChangedEventArgs.xml          |  8 +--
 17 files changed, 75 insertions(+), 98 deletions(-)

diff --git a/DeviceTests/DeviceTests.Shared/Connectivity_Tests.cs b/DeviceTests/DeviceTests.Shared/Connectivity_Tests.cs
index 2372d3e41..cc224152b 100644
--- a/DeviceTests/DeviceTests.Shared/Connectivity_Tests.cs
+++ b/DeviceTests/DeviceTests.Shared/Connectivity_Tests.cs
@@ -11,7 +11,7 @@ public void Network_Access() =>
             Assert.Equal(NetworkAccess.Internet, Connectivity.NetworkAccess);
 
         [Fact]
-        public void Profiles() =>
-            Assert.True(Connectivity.Profiles.Count() > 0);
+        public void ConnectionProfiles() =>
+            Assert.True(Connectivity.ConnectionProfiles.Count() > 0);
     }
 }
diff --git a/Samples/Samples/View/ConnectivityPage.xaml b/Samples/Samples/View/ConnectivityPage.xaml
index 68a3a2520..e4a87eaf5 100644
--- a/Samples/Samples/View/ConnectivityPage.xaml
+++ b/Samples/Samples/View/ConnectivityPage.xaml
@@ -15,7 +15,7 @@
             <StackLayout Padding="12,6,12,12" Spacing="6">
                 <Label Text="Connectivity State:" FontAttributes="Bold" />
                 <Label Text="{Binding NetworkAccess, StringFormat='NetworkAccess: {0}'}" />
-                <Label Text="{Binding Profiles, StringFormat='Profiles: {0}'}" />
+                <Label Text="{Binding ConnectionProfiles, StringFormat='ConnectionProfiles: {0}'}" />
             </StackLayout>
         </ScrollView>
     </StackLayout>
diff --git a/Samples/Samples/ViewModel/ConnectivityViewModel.cs b/Samples/Samples/ViewModel/ConnectivityViewModel.cs
index f586cac09..d67492af6 100644
--- a/Samples/Samples/ViewModel/ConnectivityViewModel.cs
+++ b/Samples/Samples/ViewModel/ConnectivityViewModel.cs
@@ -11,12 +11,12 @@ public ConnectivityViewModel()
         public string NetworkAccess =>
             Connectivity.NetworkAccess.ToString();
 
-        public string Profiles
+        public string ConnectionProfiles
         {
             get
             {
                 var profiles = string.Empty;
-                foreach (var p in Connectivity.Profiles)
+                foreach (var p in Connectivity.ConnectionProfiles)
                     profiles += "\n" + p.ToString();
                 return profiles;
             }
@@ -38,7 +38,7 @@ public override void OnDisappearing()
 
         void OnConnectivityChanged(object sender, ConnectivityChangedEventArgs e)
         {
-            OnPropertyChanged(nameof(Profiles));
+            OnPropertyChanged(nameof(ConnectionProfiles));
             OnPropertyChanged(nameof(NetworkAccess));
         }
     }
diff --git a/Tests/Connectivity_Tests.cs b/Tests/Connectivity_Tests.cs
index 604ff222f..83ed7ce03 100644
--- a/Tests/Connectivity_Tests.cs
+++ b/Tests/Connectivity_Tests.cs
@@ -10,8 +10,8 @@ public void Network_Access_On_NetStandard() =>
             Assert.Throws<NotImplementedInReferenceAssemblyException>(() => Connectivity.NetworkAccess);
 
         [Fact]
-        public void Profiles_On_NetStandard() =>
-            Assert.Throws<NotImplementedInReferenceAssemblyException>(() => Connectivity.Profiles);
+        public void ConnectionProfiles_On_NetStandard() =>
+            Assert.Throws<NotImplementedInReferenceAssemblyException>(() => Connectivity.ConnectionProfiles);
 
         [Fact]
         public void Connectivity_Changed_Event_On_NetStandard() =>
diff --git a/Xamarin.Essentials/Connectivity/Connectivity.android.cs b/Xamarin.Essentials/Connectivity/Connectivity.android.cs
index b41e32923..a90476ae0 100644
--- a/Xamarin.Essentials/Connectivity/Connectivity.android.cs
+++ b/Xamarin.Essentials/Connectivity/Connectivity.android.cs
@@ -111,7 +111,7 @@ void ProcessNetworkInfo(NetworkInfo info)
             }
         }
 
-        static IEnumerable<ConnectionProfile> PlatformProfiles
+        static IEnumerable<ConnectionProfile> PlatformConnectionProfiles
         {
             get
             {
@@ -165,40 +165,39 @@ internal static ConnectionProfile GetConnectionType(ConnectivityType connectivit
             {
                 case ConnectivityType.Ethernet:
                     return ConnectionProfile.Ethernet;
-                case ConnectivityType.Wimax:
-                    return ConnectionProfile.WiMAX;
                 case ConnectivityType.Wifi:
                     return ConnectionProfile.WiFi;
                 case ConnectivityType.Bluetooth:
                     return ConnectionProfile.Bluetooth;
+                case ConnectivityType.Wimax:
                 case ConnectivityType.Mobile:
                 case ConnectivityType.MobileDun:
                 case ConnectivityType.MobileHipri:
                 case ConnectivityType.MobileMms:
                     return ConnectionProfile.Cellular;
                 case ConnectivityType.Dummy:
-                    return ConnectionProfile.Other;
+                    return ConnectionProfile.Unknown;
                 default:
                     if (string.IsNullOrWhiteSpace(typeName))
-                        return ConnectionProfile.Other;
+                        return ConnectionProfile.Unknown;
 
                     var typeNameLower = typeName.ToLowerInvariant();
                     if (typeNameLower.Contains("mobile"))
                         return ConnectionProfile.Cellular;
 
+                    if (typeNameLower.Contains("wimax"))
+                        return ConnectionProfile.Cellular;
+
                     if (typeNameLower.Contains("wifi"))
                         return ConnectionProfile.WiFi;
 
-                    if (typeNameLower.Contains("wimax"))
-                        return ConnectionProfile.WiMAX;
-
                     if (typeNameLower.Contains("ethernet"))
                         return ConnectionProfile.Ethernet;
 
                     if (typeNameLower.Contains("bluetooth"))
                         return ConnectionProfile.Bluetooth;
 
-                    return ConnectionProfile.Other;
+                    return ConnectionProfile.Unknown;
             }
         }
     }
diff --git a/Xamarin.Essentials/Connectivity/Connectivity.ios.cs b/Xamarin.Essentials/Connectivity/Connectivity.ios.cs
index f8e8954b0..7996ebe27 100644
--- a/Xamarin.Essentials/Connectivity/Connectivity.ios.cs
+++ b/Xamarin.Essentials/Connectivity/Connectivity.ios.cs
@@ -39,7 +39,7 @@ static NetworkAccess PlatformNetworkAccess
             }
         }
 
-        static IEnumerable<ConnectionProfile> PlatformProfiles
+        static IEnumerable<ConnectionProfile> PlatformConnectionProfiles
         {
             get
             {
@@ -55,7 +55,7 @@ static IEnumerable<ConnectionProfile> PlatformProfiles
                             yield return ConnectionProfile.WiFi;
                             break;
                         default:
-                            yield return ConnectionProfile.Other;
+                            yield return ConnectionProfile.Unknown;
                             break;
                     }
                 }
diff --git a/Xamarin.Essentials/Connectivity/Connectivity.netstandard.cs b/Xamarin.Essentials/Connectivity/Connectivity.netstandard.cs
index 4ce3f4d36..b59f13942 100644
--- a/Xamarin.Essentials/Connectivity/Connectivity.netstandard.cs
+++ b/Xamarin.Essentials/Connectivity/Connectivity.netstandard.cs
@@ -7,7 +7,7 @@ public static partial class Connectivity
         static NetworkAccess PlatformNetworkAccess =>
             throw new NotImplementedInReferenceAssemblyException();
 
-        static IEnumerable<ConnectionProfile> PlatformProfiles =>
+        static IEnumerable<ConnectionProfile> PlatformConnectionProfiles =>
             throw new NotImplementedInReferenceAssemblyException();
 
         static void StartListeners() =>
diff --git a/Xamarin.Essentials/Connectivity/Connectivity.shared.cs b/Xamarin.Essentials/Connectivity/Connectivity.shared.cs
index 56e198b1e..37a76e1cb 100644
--- a/Xamarin.Essentials/Connectivity/Connectivity.shared.cs
+++ b/Xamarin.Essentials/Connectivity/Connectivity.shared.cs
@@ -15,7 +15,7 @@ public static partial class Connectivity
 
         public static NetworkAccess NetworkAccess => PlatformNetworkAccess;
 
-        public static IEnumerable<ConnectionProfile> Profiles => PlatformProfiles;
+        public static IEnumerable<ConnectionProfile> ConnectionProfiles => PlatformConnectionProfiles;
 
         public static event EventHandler<ConnectivityChangedEventArgs> ConnectivityChanged
         {
@@ -46,18 +46,18 @@ public static event EventHandler<ConnectivityChangedEventArgs> ConnectivityChang
         static void SetCurrent()
         {
             currentAccess = NetworkAccess;
-            currentProfiles = new List<ConnectionProfile>(Profiles);
+            currentProfiles = new List<ConnectionProfile>(ConnectionProfiles);
         }
 
         static void OnConnectivityChanged(NetworkAccess access, IEnumerable<ConnectionProfile> profiles)
             => OnConnectivityChanged(new ConnectivityChangedEventArgs(access, profiles));
 
         static void OnConnectivityChanged()
-            => OnConnectivityChanged(NetworkAccess, Profiles);
+            => OnConnectivityChanged(NetworkAccess, ConnectionProfiles);
 
         static void OnConnectivityChanged(ConnectivityChangedEventArgs e)
         {
-            if (currentAccess != e.NetworkAccess || !currentProfiles.SequenceEqual(e.Profiles))
+            if (currentAccess != e.NetworkAccess || !currentProfiles.SequenceEqual(e.ConnectionProfiles))
             {
                 SetCurrent();
                 MainThread.BeginInvokeOnMainThread(() => ConnectivityChangedInternal?.Invoke(null, e));
@@ -67,18 +67,18 @@ static void OnConnectivityChanged(ConnectivityChangedEventArgs e)
 
     public class ConnectivityChangedEventArgs : EventArgs
     {
-        internal ConnectivityChangedEventArgs(NetworkAccess access, IEnumerable<ConnectionProfile> profiles)
+        internal ConnectivityChangedEventArgs(NetworkAccess access, IEnumerable<ConnectionProfile> connectionProfiles)
         {
             NetworkAccess = access;
-            Profiles = profiles;
+            ConnectionProfiles = connectionProfiles;
         }
 
         public NetworkAccess NetworkAccess { get; }
 
-        public IEnumerable<ConnectionProfile> Profiles { get; }
+        public IEnumerable<ConnectionProfile> ConnectionProfiles { get; }
 
         public override string ToString() =>
             $"{nameof(NetworkAccess)}: {NetworkAccess}, " +
-            $"{nameof(Profiles)}: [{string.Join(", ", Profiles)}]";
+            $"{nameof(ConnectionProfiles)}: [{string.Join(", ", ConnectionProfiles)}]";
     }
 }
diff --git a/Xamarin.Essentials/Connectivity/Connectivity.shared.enums.cs b/Xamarin.Essentials/Connectivity/Connectivity.shared.enums.cs
index 11bdbde72..8bd308192 100644
--- a/Xamarin.Essentials/Connectivity/Connectivity.shared.enums.cs
+++ b/Xamarin.Essentials/Connectivity/Connectivity.shared.enums.cs
@@ -2,12 +2,11 @@
 {
     public enum ConnectionProfile
     {
-        Bluetooth,
-        Cellular,
-        Ethernet,
-        WiMAX,
-        WiFi,
-        Other
+        Unknown = 0,
+        Bluetooth = 1,
+        Cellular = 2,
+        Ethernet = 3,
+        WiFi = 4
     }
 
     public enum NetworkAccess
diff --git a/Xamarin.Essentials/Connectivity/Connectivity.uwp.cs b/Xamarin.Essentials/Connectivity/Connectivity.uwp.cs
index 25ca15b14..4518f7cbf 100644
--- a/Xamarin.Essentials/Connectivity/Connectivity.uwp.cs
+++ b/Xamarin.Essentials/Connectivity/Connectivity.uwp.cs
@@ -38,14 +38,14 @@ static NetworkAccess PlatformNetworkAccess
             }
         }
 
-        static IEnumerable<ConnectionProfile> PlatformProfiles
+        static IEnumerable<ConnectionProfile> PlatformConnectionProfiles
         {
             get
             {
                 var networkInterfaceList = NetworkInformation.GetConnectionProfiles();
                 foreach (var interfaceInfo in networkInterfaceList.Where(nii => nii.GetNetworkConnectivityLevel() != NetworkConnectivityLevel.None))
                 {
-                    var type = ConnectionProfile.Other;
+                    var type = ConnectionProfile.Unknown;
 
                     if (interfaceInfo.NetworkAdapter != null)
                     {
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-android.xml b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
index cf33dd2da..25238aa7a 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-android.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
@@ -106,22 +106,21 @@
       <Member Id="P:Xamarin.Essentials.CompassData.HeadingMagneticNorth" />
     </Type>
     <Type Name="Xamarin.Essentials.ConnectionProfile" Id="T:Xamarin.Essentials.ConnectionProfile">
+      <Member Id="F:Xamarin.Essentials.ConnectionProfile.Unknown" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Bluetooth" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Cellular" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Ethernet" />
-      <Member Id="F:Xamarin.Essentials.ConnectionProfile.Other" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.WiFi" />
-      <Member Id="F:Xamarin.Essentials.ConnectionProfile.WiMAX" />
     </Type>
     <Type Name="Xamarin.Essentials.Connectivity" Id="T:Xamarin.Essentials.Connectivity">
       <Member Id="E:Xamarin.Essentials.Connectivity.ConnectivityChanged" />
       <Member Id="P:Xamarin.Essentials.Connectivity.NetworkAccess" />
-      <Member Id="P:Xamarin.Essentials.Connectivity.Profiles" />
+      <Member Id="P:Xamarin.Essentials.Connectivity.ConnectionProfiles" />
     </Type>
     <Type Name="Xamarin.Essentials.ConnectivityChangedEventArgs" Id="T:Xamarin.Essentials.ConnectivityChangedEventArgs">
       <Member Id="M:Xamarin.Essentials.ConnectivityChangedEventArgs.ToString" />
       <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.NetworkAccess" />
-      <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.Profiles" />
+      <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.ConnectionProfiles" />
     </Type>
     <Type Name="Xamarin.Essentials.Share" Id="T:Xamarin.Essentials.Share">
       <Member Id="M:Xamarin.Essentials.Share.RequestAsync(System.String)" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
index 2412c1c85..bc9ca4fde 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
@@ -107,22 +107,21 @@
       <Member Id="P:Xamarin.Essentials.CompassData.HeadingMagneticNorth" />
     </Type>
     <Type Name="Xamarin.Essentials.ConnectionProfile" Id="T:Xamarin.Essentials.ConnectionProfile">
+      <Member Id="F:Xamarin.Essentials.ConnectionProfile.Unknown" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Bluetooth" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Cellular" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Ethernet" />
-      <Member Id="F:Xamarin.Essentials.ConnectionProfile.Other" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.WiFi" />
-      <Member Id="F:Xamarin.Essentials.ConnectionProfile.WiMAX" />
     </Type>
     <Type Name="Xamarin.Essentials.Connectivity" Id="T:Xamarin.Essentials.Connectivity">
       <Member Id="E:Xamarin.Essentials.Connectivity.ConnectivityChanged" />
       <Member Id="P:Xamarin.Essentials.Connectivity.NetworkAccess" />
-      <Member Id="P:Xamarin.Essentials.Connectivity.Profiles" />
+      <Member Id="P:Xamarin.Essentials.Connectivity.ConnectionProfiles" />
     </Type>
     <Type Name="Xamarin.Essentials.ConnectivityChangedEventArgs" Id="T:Xamarin.Essentials.ConnectivityChangedEventArgs">
       <Member Id="M:Xamarin.Essentials.ConnectivityChangedEventArgs.ToString" />
       <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.NetworkAccess" />
-      <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.Profiles" />
+      <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.ConnectionProfiles" />
     </Type>
     <Type Name="Xamarin.Essentials.Share" Id="T:Xamarin.Essentials.Share">
       <Member Id="M:Xamarin.Essentials.Share.RequestAsync(System.String)" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
index 09dcad344..9b392040d 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
@@ -106,22 +106,21 @@
       <Member Id="P:Xamarin.Essentials.CompassData.HeadingMagneticNorth" />
     </Type>
     <Type Name="Xamarin.Essentials.ConnectionProfile" Id="T:Xamarin.Essentials.ConnectionProfile">
+      <Member Id="F:Xamarin.Essentials.ConnectionProfile.Unknown" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Bluetooth" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Cellular" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Ethernet" />
-      <Member Id="F:Xamarin.Essentials.ConnectionProfile.Other" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.WiFi" />
-      <Member Id="F:Xamarin.Essentials.ConnectionProfile.WiMAX" />
     </Type>
     <Type Name="Xamarin.Essentials.Connectivity" Id="T:Xamarin.Essentials.Connectivity">
       <Member Id="E:Xamarin.Essentials.Connectivity.ConnectivityChanged" />
       <Member Id="P:Xamarin.Essentials.Connectivity.NetworkAccess" />
-      <Member Id="P:Xamarin.Essentials.Connectivity.Profiles" />
+      <Member Id="P:Xamarin.Essentials.Connectivity.ConnectionProfiles" />
     </Type>
     <Type Name="Xamarin.Essentials.ConnectivityChangedEventArgs" Id="T:Xamarin.Essentials.ConnectivityChangedEventArgs">
       <Member Id="M:Xamarin.Essentials.ConnectivityChangedEventArgs.ToString" />
       <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.NetworkAccess" />
-      <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.Profiles" />
+      <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.ConnectionProfiles" />
     </Type>
     <Type Name="Xamarin.Essentials.Share" Id="T:Xamarin.Essentials.Share">
       <Member Id="M:Xamarin.Essentials.Share.RequestAsync(System.String)" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials.xml b/docs/en/FrameworksIndex/xamarin-essentials.xml
index 49195f6de..69366070f 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials.xml
@@ -106,22 +106,21 @@
       <Member Id="P:Xamarin.Essentials.CompassData.HeadingMagneticNorth" />
     </Type>
     <Type Name="Xamarin.Essentials.ConnectionProfile" Id="T:Xamarin.Essentials.ConnectionProfile">
+      <Member Id="F:Xamarin.Essentials.ConnectionProfile.Unknown" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Bluetooth" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Cellular" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Ethernet" />
-      <Member Id="F:Xamarin.Essentials.ConnectionProfile.Other" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.WiFi" />
-      <Member Id="F:Xamarin.Essentials.ConnectionProfile.WiMAX" />
     </Type>
     <Type Name="Xamarin.Essentials.Connectivity" Id="T:Xamarin.Essentials.Connectivity">
       <Member Id="E:Xamarin.Essentials.Connectivity.ConnectivityChanged" />
       <Member Id="P:Xamarin.Essentials.Connectivity.NetworkAccess" />
-      <Member Id="P:Xamarin.Essentials.Connectivity.Profiles" />
+      <Member Id="P:Xamarin.Essentials.Connectivity.ConnectionProfiles" />
     </Type>
     <Type Name="Xamarin.Essentials.ConnectivityChangedEventArgs" Id="T:Xamarin.Essentials.ConnectivityChangedEventArgs">
       <Member Id="M:Xamarin.Essentials.ConnectivityChangedEventArgs.ToString" />
       <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.NetworkAccess" />
-      <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.Profiles" />
+      <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.ConnectionProfiles" />
     </Type>
     <Type Name="Xamarin.Essentials.Share" Id="T:Xamarin.Essentials.Share">
       <Member Id="M:Xamarin.Essentials.Share.RequestAsync(System.String)" />
diff --git a/docs/en/Xamarin.Essentials/ConnectionProfile.xml b/docs/en/Xamarin.Essentials/ConnectionProfile.xml
index d3fd35b09..53015c2e8 100644
--- a/docs/en/Xamarin.Essentials/ConnectionProfile.xml
+++ b/docs/en/Xamarin.Essentials/ConnectionProfile.xml
@@ -16,10 +16,10 @@
     </remarks>
   </Docs>
   <Members>
-    <Member MemberName="Bluetooth">
-      <MemberSignature Language="C#" Value="Bluetooth" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.ConnectionProfile Bluetooth = int32(0)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.ConnectionProfile.Bluetooth" />
+    <Member MemberName="Unknown">
+      <MemberSignature Language="C#" Value="Unknown" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.ConnectionProfile Unknown = int32(0)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.ConnectionProfile.Unknown" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -30,13 +30,13 @@
       </ReturnValue>
       <MemberValue>0</MemberValue>
       <Docs>
-        <summary>The bluetooth data connection.</summary>
+        <summary>Other unknown type of connection.</summary>
       </Docs>
     </Member>
-    <Member MemberName="Cellular">
-      <MemberSignature Language="C#" Value="Cellular" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.ConnectionProfile Cellular = int32(1)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.ConnectionProfile.Cellular" />
+    <Member MemberName="Bluetooth">
+      <MemberSignature Language="C#" Value="Bluetooth" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.ConnectionProfile Bluetooth = int32(1)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.ConnectionProfile.Bluetooth" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -47,13 +47,13 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>The mobile/cellular data connection.</summary>
+        <summary>The bluetooth data connection.</summary>
       </Docs>
     </Member>
-    <Member MemberName="Ethernet">
-      <MemberSignature Language="C#" Value="Ethernet" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.ConnectionProfile Ethernet = int32(2)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.ConnectionProfile.Ethernet" />
+    <Member MemberName="Cellular">
+      <MemberSignature Language="C#" Value="Cellular" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.ConnectionProfile Cellular = int32(2)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.ConnectionProfile.Cellular" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -64,13 +64,13 @@
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>The ethernet data connection.</summary>
+        <summary>The mobile/cellular data connection.</summary>
       </Docs>
     </Member>
-    <Member MemberName="Other">
-      <MemberSignature Language="C#" Value="Other" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.ConnectionProfile Other = int32(5)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.ConnectionProfile.Other" />
+    <Member MemberName="Ethernet">
+      <MemberSignature Language="C#" Value="Ethernet" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.ConnectionProfile Ethernet = int32(3)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.ConnectionProfile.Ethernet" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -79,9 +79,9 @@
       <ReturnValue>
         <ReturnType>Xamarin.Essentials.ConnectionProfile</ReturnType>
       </ReturnValue>
-      <MemberValue>5</MemberValue>
+      <MemberValue>3</MemberValue>
       <Docs>
-        <summary>Other non-known type of connection.</summary>
+        <summary>The ethernet data connection.</summary>
       </Docs>
     </Member>
     <Member MemberName="WiFi">
@@ -101,22 +101,5 @@
         <summary>The WiFi data connection.</summary>
       </Docs>
     </Member>
-    <Member MemberName="WiMAX">
-      <MemberSignature Language="C#" Value="WiMAX" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.ConnectionProfile WiMAX = int32(3)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.ConnectionProfile.WiMAX" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>Xamarin.Essentials.ConnectionProfile</ReturnType>
-      </ReturnValue>
-      <MemberValue>3</MemberValue>
-      <Docs>
-        <summary>The WiMAX data connection.</summary>
-      </Docs>
-    </Member>
   </Members>
 </Type>
diff --git a/docs/en/Xamarin.Essentials/Connectivity.xml b/docs/en/Xamarin.Essentials/Connectivity.xml
index f562a0f2d..bdeed694e 100644
--- a/docs/en/Xamarin.Essentials/Connectivity.xml
+++ b/docs/en/Xamarin.Essentials/Connectivity.xml
@@ -59,10 +59,10 @@
         </remarks>
       </Docs>
     </Member>
-    <Member MemberName="Profiles">
-      <MemberSignature Language="C#" Value="public static System.Collections.Generic.IEnumerable&lt;Xamarin.Essentials.ConnectionProfile&gt; Profiles { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property class System.Collections.Generic.IEnumerable`1&lt;valuetype Xamarin.Essentials.ConnectionProfile&gt; Profiles" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.Connectivity.Profiles" />
+    <Member MemberName="ConnectionProfiles">
+      <MemberSignature Language="C#" Value="public static System.Collections.Generic.IEnumerable&lt;Xamarin.Essentials.ConnectionProfile&gt; ConnectionProfiles { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property class System.Collections.Generic.IEnumerable`1&lt;valuetype Xamarin.Essentials.ConnectionProfile&gt; ConnectionProfiles" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.Connectivity.ConnectionProfiles" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
diff --git a/docs/en/Xamarin.Essentials/ConnectivityChangedEventArgs.xml b/docs/en/Xamarin.Essentials/ConnectivityChangedEventArgs.xml
index 3c28a0055..6e0cad0a8 100644
--- a/docs/en/Xamarin.Essentials/ConnectivityChangedEventArgs.xml
+++ b/docs/en/Xamarin.Essentials/ConnectivityChangedEventArgs.xml
@@ -37,10 +37,10 @@
         </remarks>
       </Docs>
     </Member>
-    <Member MemberName="Profiles">
-      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;Xamarin.Essentials.ConnectionProfile&gt; Profiles { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;valuetype Xamarin.Essentials.ConnectionProfile&gt; Profiles" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.ConnectivityChangedEventArgs.Profiles" />
+    <Member MemberName="ConnectionProfiles">
+      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;Xamarin.Essentials.ConnectionProfile&gt; ConnectionProfiles { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;valuetype Xamarin.Essentials.ConnectionProfile&gt; ConnectionProfiles" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.ConnectivityChangedEventArgs.ConnectionProfiles" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>

From 07962c50e283829b993aa0b0f13f1ffeac10cb42 Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Fri, 2 Nov 2018 15:53:53 -0700
Subject: [PATCH 06/43] Change MapKey to Platform.MapServiceToken only for UWP

---
 .../DeviceTests.Shared/Geocoding_Tests.cs      |  4 +++-
 Samples/Samples.UWP/MainPage.xaml.cs           |  6 +++++-
 Samples/Samples/App.xaml.cs                    |  3 ---
 .../Geocoding/Geocoding.shared.cs              |  2 --
 Xamarin.Essentials/Geocoding/Geocoding.uwp.cs  | 14 +++++++-------
 Xamarin.Essentials/Platform/Platform.uwp.cs    |  1 +
 .../xamarin-essentials-android.xml             |  1 -
 .../FrameworksIndex/xamarin-essentials-ios.xml |  1 -
 .../FrameworksIndex/xamarin-essentials-uwp.xml |  4 ++--
 docs/en/FrameworksIndex/xamarin-essentials.xml |  2 +-
 docs/en/Xamarin.Essentials/Geocoding.xml       | 18 ------------------
 docs/en/Xamarin.Essentials/Platform.xml        | 18 ++++++++++++++++++
 12 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/DeviceTests/DeviceTests.Shared/Geocoding_Tests.cs b/DeviceTests/DeviceTests.Shared/Geocoding_Tests.cs
index 7a9fc20c6..8afe13aa5 100644
--- a/DeviceTests/DeviceTests.Shared/Geocoding_Tests.cs
+++ b/DeviceTests/DeviceTests.Shared/Geocoding_Tests.cs
@@ -9,7 +9,9 @@ public class Geocoding_Tests
     {
         public Geocoding_Tests()
         {
-            Geocoding.MapKey = "RJHqIE53Onrqons5CNOx~FrDr3XhjDTyEXEjng-CRoA~Aj69MhNManYUKxo6QcwZ0wmXBtyva0zwuHB04rFYAPf7qqGJ5cHb03RCDw1jIW8l";
+#if WINDOWS_UWP
+            Platform.MapServiceToken = "RJHqIE53Onrqons5CNOx~FrDr3XhjDTyEXEjng-CRoA~Aj69MhNManYUKxo6QcwZ0wmXBtyva0zwuHB04rFYAPf7qqGJ5cHb03RCDw1jIW8l";
+#endif
         }
 
         [Theory]
diff --git a/Samples/Samples.UWP/MainPage.xaml.cs b/Samples/Samples.UWP/MainPage.xaml.cs
index 208683b47..cd0e977ae 100644
--- a/Samples/Samples.UWP/MainPage.xaml.cs
+++ b/Samples/Samples.UWP/MainPage.xaml.cs
@@ -1,4 +1,6 @@
-namespace Samples.UWP
+using Xamarin.Essentials;
+
+namespace Samples.UWP
 {
     public sealed partial class MainPage : Xamarin.Forms.Platform.UWP.WindowsPage
     {
@@ -6,6 +8,8 @@ public MainPage()
         {
             InitializeComponent();
 
+            Platform.MapServiceToken = "RJHqIE53Onrqons5CNOx~FrDr3XhjDTyEXEjng-CRoA~Aj69MhNManYUKxo6QcwZ0wmXBtyva0zwuHB04rFYAPf7qqGJ5cHb03RCDw1jIW8l";
+
             LoadApplication(new Samples.App());
         }
     }
diff --git a/Samples/Samples/App.xaml.cs b/Samples/Samples/App.xaml.cs
index 89a4fa61f..068b4160f 100644
--- a/Samples/Samples/App.xaml.cs
+++ b/Samples/Samples/App.xaml.cs
@@ -38,9 +38,6 @@ protected override void OnStart()
                 typeof(Crashes),
                 typeof(Distribute));
             }
-
-            // set UWP Map Key
-            Geocoding.MapKey = "RJHqIE53Onrqons5CNOx~FrDr3XhjDTyEXEjng-CRoA~Aj69MhNManYUKxo6QcwZ0wmXBtyva0zwuHB04rFYAPf7qqGJ5cHb03RCDw1jIW8l";
         }
 
         protected override void OnSleep()
diff --git a/Xamarin.Essentials/Geocoding/Geocoding.shared.cs b/Xamarin.Essentials/Geocoding/Geocoding.shared.cs
index 37cd993c5..77e049d24 100644
--- a/Xamarin.Essentials/Geocoding/Geocoding.shared.cs
+++ b/Xamarin.Essentials/Geocoding/Geocoding.shared.cs
@@ -6,8 +6,6 @@ namespace Xamarin.Essentials
 {
     public static partial class Geocoding
     {
-        public static string MapKey { get; set; }
-
         public static Task<IEnumerable<Placemark>> GetPlacemarksAsync(Location location)
         {
             if (location == null)
diff --git a/Xamarin.Essentials/Geocoding/Geocoding.uwp.cs b/Xamarin.Essentials/Geocoding/Geocoding.uwp.cs
index c4d2bd5a3..aa90255c4 100644
--- a/Xamarin.Essentials/Geocoding/Geocoding.uwp.cs
+++ b/Xamarin.Essentials/Geocoding/Geocoding.uwp.cs
@@ -10,7 +10,7 @@ public static partial class Geocoding
     {
         static async Task<IEnumerable<Placemark>> PlatformGetPlacemarksAsync(double latitude, double longitude)
         {
-            ValidateMapKey();
+            ValidateMapServiceToken();
 
             var point = new Geopoint(new BasicGeoposition { Latitude = latitude, Longitude = longitude });
 
@@ -21,20 +21,20 @@ static async Task<IEnumerable<Placemark>> PlatformGetPlacemarksAsync(double lati
 
         static async Task<IEnumerable<Location>> PlatformGetLocationsAsync(string address)
         {
-            ValidateMapKey();
+            ValidateMapServiceToken();
 
             var queryResults = await MapLocationFinder.FindLocationsAsync(address, null, 10);
 
             return queryResults?.Locations?.ToLocations();
         }
 
-        internal static void ValidateMapKey()
+        internal static void ValidateMapServiceToken()
         {
-            if (string.IsNullOrWhiteSpace(MapKey) && string.IsNullOrWhiteSpace(MapService.ServiceToken))
-                throw new ArgumentNullException(nameof(MapKey));
+            if (string.IsNullOrWhiteSpace(Platform.MapServiceToken) && string.IsNullOrWhiteSpace(MapService.ServiceToken))
+                throw new ArgumentNullException(nameof(Platform.MapServiceToken));
 
-            if (!string.IsNullOrWhiteSpace(MapKey))
-                MapService.ServiceToken = MapKey;
+            if (!string.IsNullOrWhiteSpace(Platform.MapServiceToken))
+                MapService.ServiceToken = Platform.MapServiceToken;
         }
     }
 }
diff --git a/Xamarin.Essentials/Platform/Platform.uwp.cs b/Xamarin.Essentials/Platform/Platform.uwp.cs
index 871d3e02e..0cab32217 100644
--- a/Xamarin.Essentials/Platform/Platform.uwp.cs
+++ b/Xamarin.Essentials/Platform/Platform.uwp.cs
@@ -2,5 +2,6 @@
 {
     public static partial class Platform
     {
+        public static string MapServiceToken { get; set; }
     }
 }
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-android.xml b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
index cf33dd2da..df33904d8 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-android.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
@@ -213,7 +213,6 @@
       <Member Id="M:Xamarin.Essentials.Geocoding.GetLocationsAsync(System.String)" />
       <Member Id="M:Xamarin.Essentials.Geocoding.GetPlacemarksAsync(System.Double,System.Double)" />
       <Member Id="M:Xamarin.Essentials.Geocoding.GetPlacemarksAsync(Xamarin.Essentials.Location)" />
-      <Member Id="P:Xamarin.Essentials.Geocoding.MapKey" />
     </Type>
     <Type Name="Xamarin.Essentials.Geolocation" Id="T:Xamarin.Essentials.Geolocation">
       <Member Id="M:Xamarin.Essentials.Geolocation.GetLastKnownLocationAsync" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
index 2412c1c85..2037a5b71 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
@@ -214,7 +214,6 @@
       <Member Id="M:Xamarin.Essentials.Geocoding.GetLocationsAsync(System.String)" />
       <Member Id="M:Xamarin.Essentials.Geocoding.GetPlacemarksAsync(System.Double,System.Double)" />
       <Member Id="M:Xamarin.Essentials.Geocoding.GetPlacemarksAsync(Xamarin.Essentials.Location)" />
-      <Member Id="P:Xamarin.Essentials.Geocoding.MapKey" />
     </Type>
     <Type Name="Xamarin.Essentials.Geolocation" Id="T:Xamarin.Essentials.Geolocation">
       <Member Id="M:Xamarin.Essentials.Geolocation.GetLastKnownLocationAsync" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
index 09dcad344..d58f7b137 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
@@ -213,7 +213,6 @@
       <Member Id="M:Xamarin.Essentials.Geocoding.GetLocationsAsync(System.String)" />
       <Member Id="M:Xamarin.Essentials.Geocoding.GetPlacemarksAsync(System.Double,System.Double)" />
       <Member Id="M:Xamarin.Essentials.Geocoding.GetPlacemarksAsync(Xamarin.Essentials.Location)" />
-      <Member Id="P:Xamarin.Essentials.Geocoding.MapKey" />
     </Type>
     <Type Name="Xamarin.Essentials.Geolocation" Id="T:Xamarin.Essentials.Geolocation">
       <Member Id="M:Xamarin.Essentials.Geolocation.GetLastKnownLocationAsync" />
@@ -389,7 +388,8 @@
       <Member Id="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark)" />
       <Member Id="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapsLaunchOptions)" />
     </Type>
-    <Type Name="Xamarin.Essentials.Platform" Id="T:Xamarin.Essentials.Platform" />
+    <Type Name="Xamarin.Essentials.Platform" Id="T:Xamarin.Essentials.Platform">
+          <Member Id="P:Xamarin.Essentials.Platform.MapServiceToken" />
     <Type Name="Xamarin.Essentials.Power" Id="T:Xamarin.Essentials.Power">
       <Member Id="E:Xamarin.Essentials.Power.EnergySaverStatusChanged" />
       <Member Id="P:Xamarin.Essentials.Power.EnergySaverStatus" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials.xml b/docs/en/FrameworksIndex/xamarin-essentials.xml
index 49195f6de..b8903f8a4 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials.xml
@@ -213,7 +213,7 @@
       <Member Id="M:Xamarin.Essentials.Geocoding.GetLocationsAsync(System.String)" />
       <Member Id="M:Xamarin.Essentials.Geocoding.GetPlacemarksAsync(System.Double,System.Double)" />
       <Member Id="M:Xamarin.Essentials.Geocoding.GetPlacemarksAsync(Xamarin.Essentials.Location)" />
-      <Member Id="P:Xamarin.Essentials.Geocoding.MapKey" />
+
     </Type>
     <Type Name="Xamarin.Essentials.Geolocation" Id="T:Xamarin.Essentials.Geolocation">
       <Member Id="M:Xamarin.Essentials.Geolocation.GetLastKnownLocationAsync" />
diff --git a/docs/en/Xamarin.Essentials/Geocoding.xml b/docs/en/Xamarin.Essentials/Geocoding.xml
index e0d732f8f..1b0e906e4 100644
--- a/docs/en/Xamarin.Essentials/Geocoding.xml
+++ b/docs/en/Xamarin.Essentials/Geocoding.xml
@@ -93,23 +93,5 @@
         </remarks>
       </Docs>
     </Member>
-    <Member MemberName="MapKey">
-      <MemberSignature Language="C#" Value="public static string MapKey { get; set; }" />
-      <MemberSignature Language="ILAsm" Value=".property string MapKey" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.Geocoding.MapKey" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>Get or sets the map API key.</summary>
-        <value>The current key for maps.</value>
-        <remarks>Needed only for UWP and can be generated from Bing Maps.</remarks>
-      </Docs>
-    </Member>
   </Members>
 </Type>
diff --git a/docs/en/Xamarin.Essentials/Platform.xml b/docs/en/Xamarin.Essentials/Platform.xml
index 2be0e01ac..0c7d1d09f 100644
--- a/docs/en/Xamarin.Essentials/Platform.xml
+++ b/docs/en/Xamarin.Essentials/Platform.xml
@@ -65,6 +65,24 @@
         </remarks>
       </Docs>
     </Member>
+    <Member MemberName="MapServiceToken">
+      <MemberSignature Language="C#" Value="public static string MapKey { get; set; }" />
+      <MemberSignature Language="ILAsm" Value=".property string MapKey" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.Platform.MapServiceToken" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.String</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Get or sets the map API key.</summary>
+        <value>The current key for maps.</value>
+        <remarks>Needed only for UWP and can be generated from Bing Maps.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="OnRequestPermissionsResult">
       <MemberSignature Language="C#" Value="public static void OnRequestPermissionsResult (int requestCode, string[] permissions, Android.Content.PM.Permission[] grantResults);" />
       <MemberSignature Language="ILAsm" Value=".method public static hidebysig void OnRequestPermissionsResult(int32 requestCode, string[] permissions, valuetype Android.Content.PM.Permission[] grantResults) cil managed" />

From 7367daece9bd9050638e243f1aa56ff9b182bfca Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sat, 3 Nov 2018 00:55:29 +0200
Subject: [PATCH 07/43] Dropping the version of the device runner until we can
 figure out what is broken on UWP (#596)

---
 DeviceTests/DeviceTests.Shared/DeviceTests.Shared.csproj | 2 +-
 DeviceTests/DeviceTests.UWP/DeviceTests.UWP.csproj       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DeviceTests/DeviceTests.Shared/DeviceTests.Shared.csproj b/DeviceTests/DeviceTests.Shared/DeviceTests.Shared.csproj
index 045176e6a..56267a795 100644
--- a/DeviceTests/DeviceTests.Shared/DeviceTests.Shared.csproj
+++ b/DeviceTests/DeviceTests.Shared/DeviceTests.Shared.csproj
@@ -33,7 +33,7 @@
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
     <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.devices" Version="2.4.48" />
+    <PackageReference Include="xunit.runner.devices" Version="2.3.3" />
     <PackageReference Include="UnitTests.HeadlessRunner" Version="2.0.0" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     <ProjectReference Include="..\..\Xamarin.Essentials\Xamarin.Essentials.csproj" />
diff --git a/DeviceTests/DeviceTests.UWP/DeviceTests.UWP.csproj b/DeviceTests/DeviceTests.UWP/DeviceTests.UWP.csproj
index ea181c333..0c64d715e 100644
--- a/DeviceTests/DeviceTests.UWP/DeviceTests.UWP.csproj
+++ b/DeviceTests/DeviceTests.UWP/DeviceTests.UWP.csproj
@@ -130,7 +130,7 @@
     <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.5" />
     <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.devices" Version="2.4.48" />
+    <PackageReference Include="xunit.runner.devices" Version="2.3.3" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>

From 68155eb040528b67a19699f4be0072d7584925c6 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Fri, 2 Nov 2018 18:57:55 -0400
Subject: [PATCH 08/43] Update
 docs/en/FrameworksIndex/xamarin-essentials-uwp.xml

Co-Authored-By: jamesmontemagno <james.montemagno@gmail.com>
---
 docs/en/FrameworksIndex/xamarin-essentials-uwp.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
index d58f7b137..7c0384d00 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
@@ -390,6 +390,7 @@
     </Type>
     <Type Name="Xamarin.Essentials.Platform" Id="T:Xamarin.Essentials.Platform">
           <Member Id="P:Xamarin.Essentials.Platform.MapServiceToken" />
+    </Type>
     <Type Name="Xamarin.Essentials.Power" Id="T:Xamarin.Essentials.Power">
       <Member Id="E:Xamarin.Essentials.Power.EnergySaverStatusChanged" />
       <Member Id="P:Xamarin.Essentials.Power.EnergySaverStatus" />

From 49db0773f19041ad04e1f91a02405d095f78d361 Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Fri, 2 Nov 2018 16:03:08 -0700
Subject: [PATCH 09/43] Fix spacing

---
 docs/en/FrameworksIndex/xamarin-essentials-uwp.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
index 7c0384d00..4e665aeb6 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
@@ -389,7 +389,7 @@
       <Member Id="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapsLaunchOptions)" />
     </Type>
     <Type Name="Xamarin.Essentials.Platform" Id="T:Xamarin.Essentials.Platform">
-          <Member Id="P:Xamarin.Essentials.Platform.MapServiceToken" />
+      <Member Id="P:Xamarin.Essentials.Platform.MapServiceToken" />
     </Type>
     <Type Name="Xamarin.Essentials.Power" Id="T:Xamarin.Essentials.Power">
       <Member Id="E:Xamarin.Essentials.Power.EnergySaverStatusChanged" />

From 36c53af1822743bf82d5d572ebd2a5a009c21afd Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sat, 3 Nov 2018 01:16:54 +0200
Subject: [PATCH 10/43] Updated DOCS!

---
 .../xamarin-essentials-android.xml            | 19 +++++----
 .../xamarin-essentials-ios.xml                | 19 +++++----
 .../xamarin-essentials-uwp.xml                | 19 +++++----
 .../en/FrameworksIndex/xamarin-essentials.xml | 20 +++++-----
 docs/en/Xamarin.Essentials/AppInfo.xml        | 36 ++++++++---------
 .../Xamarin.Essentials/ConnectionProfile.xml  | 34 ++++++++--------
 docs/en/Xamarin.Essentials/Connectivity.xml   | 40 +++++++++----------
 .../ConnectivityChangedEventArgs.xml          | 32 +++++++--------
 docs/en/Xamarin.Essentials/Platform.xml       |  4 +-
 docs/en/index.xml                             |  8 ++--
 10 files changed, 121 insertions(+), 110 deletions(-)

diff --git a/docs/en/FrameworksIndex/xamarin-essentials-android.xml b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
index 4db55a975..1fca8395d 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-android.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
@@ -1,4 +1,7 @@
 <Framework Name="xamarin-essentials-android">
+  <Assemblies>
+    <Assembly Name="Xamarin.Essentials" Version="1.0.0.0" />
+  </Assemblies>
   <Namespace Name="Xamarin.Essentials">
     <Type Name="Xamarin.Essentials.Accelerometer" Id="T:Xamarin.Essentials.Accelerometer">
       <Member Id="E:Xamarin.Essentials.Accelerometer.ReadingChanged" />
@@ -106,26 +109,21 @@
       <Member Id="P:Xamarin.Essentials.CompassData.HeadingMagneticNorth" />
     </Type>
     <Type Name="Xamarin.Essentials.ConnectionProfile" Id="T:Xamarin.Essentials.ConnectionProfile">
-      <Member Id="F:Xamarin.Essentials.ConnectionProfile.Unknown" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Bluetooth" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Cellular" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Ethernet" />
+      <Member Id="F:Xamarin.Essentials.ConnectionProfile.Unknown" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.WiFi" />
     </Type>
     <Type Name="Xamarin.Essentials.Connectivity" Id="T:Xamarin.Essentials.Connectivity">
       <Member Id="E:Xamarin.Essentials.Connectivity.ConnectivityChanged" />
-      <Member Id="P:Xamarin.Essentials.Connectivity.NetworkAccess" />
       <Member Id="P:Xamarin.Essentials.Connectivity.ConnectionProfiles" />
+      <Member Id="P:Xamarin.Essentials.Connectivity.NetworkAccess" />
     </Type>
     <Type Name="Xamarin.Essentials.ConnectivityChangedEventArgs" Id="T:Xamarin.Essentials.ConnectivityChangedEventArgs">
       <Member Id="M:Xamarin.Essentials.ConnectivityChangedEventArgs.ToString" />
-      <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.NetworkAccess" />
       <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.ConnectionProfiles" />
-    </Type>
-    <Type Name="Xamarin.Essentials.Share" Id="T:Xamarin.Essentials.Share">
-      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(System.String)" />
-      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(System.String,System.String)" />
-      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(Xamarin.Essentials.ShareTextRequest)" />
+      <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.NetworkAccess" />
     </Type>
     <Type Name="Xamarin.Essentials.DeviceDisplay" Id="T:Xamarin.Essentials.DeviceDisplay">
       <Member Id="E:Xamarin.Essentials.DeviceDisplay.ScreenMetricsChanged" />
@@ -477,6 +475,11 @@
       <Member Id="F:Xamarin.Essentials.SensorSpeed.Normal" />
       <Member Id="F:Xamarin.Essentials.SensorSpeed.UI" />
     </Type>
+    <Type Name="Xamarin.Essentials.Share" Id="T:Xamarin.Essentials.Share">
+      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(System.String)" />
+      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(System.String,System.String)" />
+      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(Xamarin.Essentials.ShareTextRequest)" />
+    </Type>
     <Type Name="Xamarin.Essentials.ShareTextRequest" Id="T:Xamarin.Essentials.ShareTextRequest">
       <Member Id="M:Xamarin.Essentials.ShareTextRequest.#ctor" />
       <Member Id="M:Xamarin.Essentials.ShareTextRequest.#ctor(System.String)" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
index 4ed01e6fa..7aa34e6a8 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
@@ -1,4 +1,7 @@
 <Framework Name="xamarin-essentials-ios">
+  <Assemblies>
+    <Assembly Name="Xamarin.Essentials" Version="1.0.0.0" />
+  </Assemblies>
   <Namespace Name="Xamarin.Essentials">
     <Type Name="Xamarin.Essentials.Accelerometer" Id="T:Xamarin.Essentials.Accelerometer">
       <Member Id="E:Xamarin.Essentials.Accelerometer.ReadingChanged" />
@@ -107,26 +110,21 @@
       <Member Id="P:Xamarin.Essentials.CompassData.HeadingMagneticNorth" />
     </Type>
     <Type Name="Xamarin.Essentials.ConnectionProfile" Id="T:Xamarin.Essentials.ConnectionProfile">
-      <Member Id="F:Xamarin.Essentials.ConnectionProfile.Unknown" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Bluetooth" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Cellular" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Ethernet" />
+      <Member Id="F:Xamarin.Essentials.ConnectionProfile.Unknown" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.WiFi" />
     </Type>
     <Type Name="Xamarin.Essentials.Connectivity" Id="T:Xamarin.Essentials.Connectivity">
       <Member Id="E:Xamarin.Essentials.Connectivity.ConnectivityChanged" />
-      <Member Id="P:Xamarin.Essentials.Connectivity.NetworkAccess" />
       <Member Id="P:Xamarin.Essentials.Connectivity.ConnectionProfiles" />
+      <Member Id="P:Xamarin.Essentials.Connectivity.NetworkAccess" />
     </Type>
     <Type Name="Xamarin.Essentials.ConnectivityChangedEventArgs" Id="T:Xamarin.Essentials.ConnectivityChangedEventArgs">
       <Member Id="M:Xamarin.Essentials.ConnectivityChangedEventArgs.ToString" />
-      <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.NetworkAccess" />
       <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.ConnectionProfiles" />
-    </Type>
-    <Type Name="Xamarin.Essentials.Share" Id="T:Xamarin.Essentials.Share">
-      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(System.String)" />
-      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(System.String,System.String)" />
-      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(Xamarin.Essentials.ShareTextRequest)" />
+      <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.NetworkAccess" />
     </Type>
     <Type Name="Xamarin.Essentials.DeviceDisplay" Id="T:Xamarin.Essentials.DeviceDisplay">
       <Member Id="E:Xamarin.Essentials.DeviceDisplay.ScreenMetricsChanged" />
@@ -476,6 +474,11 @@
       <Member Id="F:Xamarin.Essentials.SensorSpeed.Normal" />
       <Member Id="F:Xamarin.Essentials.SensorSpeed.UI" />
     </Type>
+    <Type Name="Xamarin.Essentials.Share" Id="T:Xamarin.Essentials.Share">
+      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(System.String)" />
+      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(System.String,System.String)" />
+      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(Xamarin.Essentials.ShareTextRequest)" />
+    </Type>
     <Type Name="Xamarin.Essentials.ShareTextRequest" Id="T:Xamarin.Essentials.ShareTextRequest">
       <Member Id="M:Xamarin.Essentials.ShareTextRequest.#ctor" />
       <Member Id="M:Xamarin.Essentials.ShareTextRequest.#ctor(System.String)" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
index 1e8e041de..515e2723d 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
@@ -1,4 +1,7 @@
 <Framework Name="xamarin-essentials-uwp">
+  <Assemblies>
+    <Assembly Name="Xamarin.Essentials" Version="1.0.0.0" />
+  </Assemblies>
   <Namespace Name="Xamarin.Essentials">
     <Type Name="Xamarin.Essentials.Accelerometer" Id="T:Xamarin.Essentials.Accelerometer">
       <Member Id="E:Xamarin.Essentials.Accelerometer.ReadingChanged" />
@@ -106,26 +109,21 @@
       <Member Id="P:Xamarin.Essentials.CompassData.HeadingMagneticNorth" />
     </Type>
     <Type Name="Xamarin.Essentials.ConnectionProfile" Id="T:Xamarin.Essentials.ConnectionProfile">
-      <Member Id="F:Xamarin.Essentials.ConnectionProfile.Unknown" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Bluetooth" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Cellular" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Ethernet" />
+      <Member Id="F:Xamarin.Essentials.ConnectionProfile.Unknown" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.WiFi" />
     </Type>
     <Type Name="Xamarin.Essentials.Connectivity" Id="T:Xamarin.Essentials.Connectivity">
       <Member Id="E:Xamarin.Essentials.Connectivity.ConnectivityChanged" />
-      <Member Id="P:Xamarin.Essentials.Connectivity.NetworkAccess" />
       <Member Id="P:Xamarin.Essentials.Connectivity.ConnectionProfiles" />
+      <Member Id="P:Xamarin.Essentials.Connectivity.NetworkAccess" />
     </Type>
     <Type Name="Xamarin.Essentials.ConnectivityChangedEventArgs" Id="T:Xamarin.Essentials.ConnectivityChangedEventArgs">
       <Member Id="M:Xamarin.Essentials.ConnectivityChangedEventArgs.ToString" />
-      <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.NetworkAccess" />
       <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.ConnectionProfiles" />
-    </Type>
-    <Type Name="Xamarin.Essentials.Share" Id="T:Xamarin.Essentials.Share">
-      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(System.String)" />
-      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(System.String,System.String)" />
-      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(Xamarin.Essentials.ShareTextRequest)" />
+      <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.NetworkAccess" />
     </Type>
     <Type Name="Xamarin.Essentials.DeviceDisplay" Id="T:Xamarin.Essentials.DeviceDisplay">
       <Member Id="E:Xamarin.Essentials.DeviceDisplay.ScreenMetricsChanged" />
@@ -475,6 +473,11 @@
       <Member Id="F:Xamarin.Essentials.SensorSpeed.Normal" />
       <Member Id="F:Xamarin.Essentials.SensorSpeed.UI" />
     </Type>
+    <Type Name="Xamarin.Essentials.Share" Id="T:Xamarin.Essentials.Share">
+      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(System.String)" />
+      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(System.String,System.String)" />
+      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(Xamarin.Essentials.ShareTextRequest)" />
+    </Type>
     <Type Name="Xamarin.Essentials.ShareTextRequest" Id="T:Xamarin.Essentials.ShareTextRequest">
       <Member Id="M:Xamarin.Essentials.ShareTextRequest.#ctor" />
       <Member Id="M:Xamarin.Essentials.ShareTextRequest.#ctor(System.String)" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials.xml b/docs/en/FrameworksIndex/xamarin-essentials.xml
index 4ff3bf984..5d3bf2ff3 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials.xml
@@ -1,4 +1,7 @@
 <Framework Name="xamarin-essentials">
+  <Assemblies>
+    <Assembly Name="Xamarin.Essentials" Version="1.0.0.0" />
+  </Assemblies>
   <Namespace Name="Xamarin.Essentials">
     <Type Name="Xamarin.Essentials.Accelerometer" Id="T:Xamarin.Essentials.Accelerometer">
       <Member Id="E:Xamarin.Essentials.Accelerometer.ReadingChanged" />
@@ -106,26 +109,21 @@
       <Member Id="P:Xamarin.Essentials.CompassData.HeadingMagneticNorth" />
     </Type>
     <Type Name="Xamarin.Essentials.ConnectionProfile" Id="T:Xamarin.Essentials.ConnectionProfile">
-      <Member Id="F:Xamarin.Essentials.ConnectionProfile.Unknown" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Bluetooth" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Cellular" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.Ethernet" />
+      <Member Id="F:Xamarin.Essentials.ConnectionProfile.Unknown" />
       <Member Id="F:Xamarin.Essentials.ConnectionProfile.WiFi" />
     </Type>
     <Type Name="Xamarin.Essentials.Connectivity" Id="T:Xamarin.Essentials.Connectivity">
       <Member Id="E:Xamarin.Essentials.Connectivity.ConnectivityChanged" />
-      <Member Id="P:Xamarin.Essentials.Connectivity.NetworkAccess" />
       <Member Id="P:Xamarin.Essentials.Connectivity.ConnectionProfiles" />
+      <Member Id="P:Xamarin.Essentials.Connectivity.NetworkAccess" />
     </Type>
     <Type Name="Xamarin.Essentials.ConnectivityChangedEventArgs" Id="T:Xamarin.Essentials.ConnectivityChangedEventArgs">
       <Member Id="M:Xamarin.Essentials.ConnectivityChangedEventArgs.ToString" />
-      <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.NetworkAccess" />
       <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.ConnectionProfiles" />
-    </Type>
-    <Type Name="Xamarin.Essentials.Share" Id="T:Xamarin.Essentials.Share">
-      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(System.String)" />
-      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(System.String,System.String)" />
-      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(Xamarin.Essentials.ShareTextRequest)" />
+      <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.NetworkAccess" />
     </Type>
     <Type Name="Xamarin.Essentials.DeviceDisplay" Id="T:Xamarin.Essentials.DeviceDisplay">
       <Member Id="E:Xamarin.Essentials.DeviceDisplay.ScreenMetricsChanged" />
@@ -212,7 +210,6 @@
       <Member Id="M:Xamarin.Essentials.Geocoding.GetLocationsAsync(System.String)" />
       <Member Id="M:Xamarin.Essentials.Geocoding.GetPlacemarksAsync(System.Double,System.Double)" />
       <Member Id="M:Xamarin.Essentials.Geocoding.GetPlacemarksAsync(Xamarin.Essentials.Location)" />
-
     </Type>
     <Type Name="Xamarin.Essentials.Geolocation" Id="T:Xamarin.Essentials.Geolocation">
       <Member Id="M:Xamarin.Essentials.Geolocation.GetLastKnownLocationAsync" />
@@ -474,6 +471,11 @@
       <Member Id="F:Xamarin.Essentials.SensorSpeed.Normal" />
       <Member Id="F:Xamarin.Essentials.SensorSpeed.UI" />
     </Type>
+    <Type Name="Xamarin.Essentials.Share" Id="T:Xamarin.Essentials.Share">
+      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(System.String)" />
+      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(System.String,System.String)" />
+      <Member Id="M:Xamarin.Essentials.Share.RequestAsync(Xamarin.Essentials.ShareTextRequest)" />
+    </Type>
     <Type Name="Xamarin.Essentials.ShareTextRequest" Id="T:Xamarin.Essentials.ShareTextRequest">
       <Member Id="M:Xamarin.Essentials.ShareTextRequest.#ctor" />
       <Member Id="M:Xamarin.Essentials.ShareTextRequest.#ctor(System.String)" />
diff --git a/docs/en/Xamarin.Essentials/AppInfo.xml b/docs/en/Xamarin.Essentials/AppInfo.xml
index 51e0c89da..a51c02f10 100644
--- a/docs/en/Xamarin.Essentials/AppInfo.xml
+++ b/docs/en/Xamarin.Essentials/AppInfo.xml
@@ -53,6 +53,24 @@
         <remarks></remarks>
       </Docs>
     </Member>
+    <Member MemberName="PackageName">
+      <MemberSignature Language="C#" Value="public static string PackageName { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property string PackageName" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.AppInfo.PackageName" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.String</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Gets the application package name or identifier.</summary>
+        <value>The package name or identifier.</value>
+        <remarks>On android and iOS, this is the application package name. On UWP, this is the application GUID.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="ShowSettingsUI">
       <MemberSignature Language="C#" Value="public static void ShowSettingsUI ();" />
       <MemberSignature Language="ILAsm" Value=".method public static hidebysig void ShowSettingsUI() cil managed" />
@@ -73,24 +91,6 @@
         </remarks>
       </Docs>
     </Member>
-    <Member MemberName="PackageName">
-      <MemberSignature Language="C#" Value="public static string PackageName { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property string PackageName" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.AppInfo.PackageName" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>Gets the application package name or identifier.</summary>
-        <value>The package name or identifier.</value>
-        <remarks>On android and iOS, this is the application package name. On UWP, this is the application GUID.</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="Version">
       <MemberSignature Language="C#" Value="public static Version Version { get; }" />
       <MemberSignature Language="ILAsm" Value=".property class System.Version Version" />
diff --git a/docs/en/Xamarin.Essentials/ConnectionProfile.xml b/docs/en/Xamarin.Essentials/ConnectionProfile.xml
index 53015c2e8..4e72eaab2 100644
--- a/docs/en/Xamarin.Essentials/ConnectionProfile.xml
+++ b/docs/en/Xamarin.Essentials/ConnectionProfile.xml
@@ -16,23 +16,6 @@
     </remarks>
   </Docs>
   <Members>
-    <Member MemberName="Unknown">
-      <MemberSignature Language="C#" Value="Unknown" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.ConnectionProfile Unknown = int32(0)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.ConnectionProfile.Unknown" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>Xamarin.Essentials.ConnectionProfile</ReturnType>
-      </ReturnValue>
-      <MemberValue>0</MemberValue>
-      <Docs>
-        <summary>Other unknown type of connection.</summary>
-      </Docs>
-    </Member>
     <Member MemberName="Bluetooth">
       <MemberSignature Language="C#" Value="Bluetooth" />
       <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.ConnectionProfile Bluetooth = int32(1)" />
@@ -84,6 +67,23 @@
         <summary>The ethernet data connection.</summary>
       </Docs>
     </Member>
+    <Member MemberName="Unknown">
+      <MemberSignature Language="C#" Value="Unknown" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.ConnectionProfile Unknown = int32(0)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.ConnectionProfile.Unknown" />
+      <MemberType>Field</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Xamarin.Essentials.ConnectionProfile</ReturnType>
+      </ReturnValue>
+      <MemberValue>0</MemberValue>
+      <Docs>
+        <summary>Other unknown type of connection.</summary>
+      </Docs>
+    </Member>
     <Member MemberName="WiFi">
       <MemberSignature Language="C#" Value="WiFi" />
       <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.ConnectionProfile WiFi = int32(4)" />
diff --git a/docs/en/Xamarin.Essentials/Connectivity.xml b/docs/en/Xamarin.Essentials/Connectivity.xml
index bdeed694e..2033b90ab 100644
--- a/docs/en/Xamarin.Essentials/Connectivity.xml
+++ b/docs/en/Xamarin.Essentials/Connectivity.xml
@@ -17,6 +17,26 @@
     </remarks>
   </Docs>
   <Members>
+    <Member MemberName="ConnectionProfiles">
+      <MemberSignature Language="C#" Value="public static System.Collections.Generic.IEnumerable&lt;Xamarin.Essentials.ConnectionProfile&gt; ConnectionProfiles { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property class System.Collections.Generic.IEnumerable`1&lt;valuetype Xamarin.Essentials.ConnectionProfile&gt; ConnectionProfiles" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.Connectivity.ConnectionProfiles" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Collections.Generic.IEnumerable&lt;Xamarin.Essentials.ConnectionProfile&gt;</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Gets the active connectivity types for the device.</summary>
+        <value>List of all connection profiles.</value>
+        <remarks>
+          <para>Can throw PermissionException on Android if ACCESS_NETWORK_STATE is not set in manifest.</para>
+        </remarks>
+      </Docs>
+    </Member>
     <Member MemberName="ConnectivityChanged">
       <MemberSignature Language="C#" Value="public static event EventHandler&lt;Xamarin.Essentials.ConnectivityChangedEventArgs&gt; ConnectivityChanged;" />
       <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class Xamarin.Essentials.ConnectivityChangedEventArgs&gt; ConnectivityChanged" />
@@ -59,25 +79,5 @@
         </remarks>
       </Docs>
     </Member>
-    <Member MemberName="ConnectionProfiles">
-      <MemberSignature Language="C#" Value="public static System.Collections.Generic.IEnumerable&lt;Xamarin.Essentials.ConnectionProfile&gt; ConnectionProfiles { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property class System.Collections.Generic.IEnumerable`1&lt;valuetype Xamarin.Essentials.ConnectionProfile&gt; ConnectionProfiles" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.Connectivity.ConnectionProfiles" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;Xamarin.Essentials.ConnectionProfile&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>Gets the active connectivity types for the device.</summary>
-        <value>List of all connection profiles.</value>
-        <remarks>
-          <para>Can throw PermissionException on Android if ACCESS_NETWORK_STATE is not set in manifest.</para>
-        </remarks>
-      </Docs>
-    </Member>
   </Members>
 </Type>
diff --git a/docs/en/Xamarin.Essentials/ConnectivityChangedEventArgs.xml b/docs/en/Xamarin.Essentials/ConnectivityChangedEventArgs.xml
index 6e0cad0a8..078412ec0 100644
--- a/docs/en/Xamarin.Essentials/ConnectivityChangedEventArgs.xml
+++ b/docs/en/Xamarin.Essentials/ConnectivityChangedEventArgs.xml
@@ -17,43 +17,43 @@
     </remarks>
   </Docs>
   <Members>
-    <Member MemberName="NetworkAccess">
-      <MemberSignature Language="C#" Value="public Xamarin.Essentials.NetworkAccess NetworkAccess { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Essentials.NetworkAccess NetworkAccess" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.ConnectivityChangedEventArgs.NetworkAccess" />
+    <Member MemberName="ConnectionProfiles">
+      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;Xamarin.Essentials.ConnectionProfile&gt; ConnectionProfiles { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;valuetype Xamarin.Essentials.ConnectionProfile&gt; ConnectionProfiles" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.ConnectivityChangedEventArgs.ConnectionProfiles" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>Xamarin.Essentials.NetworkAccess</ReturnType>
+        <ReturnType>System.Collections.Generic.IEnumerable&lt;Xamarin.Essentials.ConnectionProfile&gt;</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Gets the current state of network access. Does not guarantee full access to the internet.</summary>
-        <value>The current network access state.</value>
+        <summary>Gets the active connectivity types for the device.</summary>
+        <value>List of all connection profiles.</value>
         <remarks>
-          <para></para>
+          <para />
         </remarks>
       </Docs>
     </Member>
-    <Member MemberName="ConnectionProfiles">
-      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;Xamarin.Essentials.ConnectionProfile&gt; ConnectionProfiles { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;valuetype Xamarin.Essentials.ConnectionProfile&gt; ConnectionProfiles" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.ConnectivityChangedEventArgs.ConnectionProfiles" />
+    <Member MemberName="NetworkAccess">
+      <MemberSignature Language="C#" Value="public Xamarin.Essentials.NetworkAccess NetworkAccess { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Essentials.NetworkAccess NetworkAccess" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.ConnectivityChangedEventArgs.NetworkAccess" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>System.Collections.Generic.IEnumerable&lt;Xamarin.Essentials.ConnectionProfile&gt;</ReturnType>
+        <ReturnType>Xamarin.Essentials.NetworkAccess</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Gets the active connectivity types for the device.</summary>
-        <value>List of all connection profiles.</value>
+        <summary>Gets the current state of network access. Does not guarantee full access to the internet.</summary>
+        <value>The current network access state.</value>
         <remarks>
-          <para />
+          <para></para>
         </remarks>
       </Docs>
     </Member>
diff --git a/docs/en/Xamarin.Essentials/Platform.xml b/docs/en/Xamarin.Essentials/Platform.xml
index 0c7d1d09f..1048286c4 100644
--- a/docs/en/Xamarin.Essentials/Platform.xml
+++ b/docs/en/Xamarin.Essentials/Platform.xml
@@ -66,8 +66,8 @@
       </Docs>
     </Member>
     <Member MemberName="MapServiceToken">
-      <MemberSignature Language="C#" Value="public static string MapKey { get; set; }" />
-      <MemberSignature Language="ILAsm" Value=".property string MapKey" />
+      <MemberSignature Language="C#" Value="public static string MapServiceToken { get; set; }" />
+      <MemberSignature Language="ILAsm" Value=".property string MapServiceToken" />
       <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.Platform.MapServiceToken" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
diff --git a/docs/en/index.xml b/docs/en/index.xml
index d379781fd..a6e85ba2a 100644
--- a/docs/en/index.xml
+++ b/docs/en/index.xml
@@ -50,9 +50,6 @@
         <Attribute FrameworkAlternate="xamarin-essentials">
           <AttributeName>System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v2.0", FrameworkDisplayName="")</AttributeName>
         </Attribute>
-        <Attribute>
-          <AttributeName>System.Reflection.AssemblyInformationalVersion("1.0.0+8db259fd337f910db5b9158f8ab6b5cdbb783499")</AttributeName>
-        </Attribute>
         <Attribute>
           <AttributeName>System.Runtime.CompilerServices.InternalsVisibleTo("XamarinEssentialsDeviceTestsShared")</AttributeName>
         </Attribute>
@@ -80,6 +77,9 @@
         <Attribute FrameworkAlternate="xamarin-essentials-uwp">
           <AttributeName>System.Runtime.Versioning.TargetFramework(".NETCore,Version=v5.0", FrameworkDisplayName=".NET for Windows Universal")</AttributeName>
         </Attribute>
+        <Attribute>
+          <AttributeName>System.Reflection.AssemblyInformationalVersion("1.0.0+2fe4bedaf457fd79b590e4b34d21e5fdb6de1b33")</AttributeName>
+        </Attribute>
       </Attributes>
     </Assembly>
   </Assemblies>
@@ -107,7 +107,6 @@
       <Type Name="ConnectionProfile" Kind="Enumeration" />
       <Type Name="Connectivity" Kind="Class" />
       <Type Name="ConnectivityChangedEventArgs" Kind="Class" />
-      <Type Name="Share" Kind="Class" />
       <Type Name="DeviceDisplay" Kind="Class" />
       <Type Name="DeviceInfo" Kind="Class" />
       <Type Name="DeviceInfo+Idioms" Kind="Class" />
@@ -160,6 +159,7 @@
       <Type Name="ScreenRotation" Kind="Enumeration" />
       <Type Name="SecureStorage" Kind="Class" />
       <Type Name="SensorSpeed" Kind="Enumeration" />
+      <Type Name="Share" Kind="Class" />
       <Type Name="ShareTextRequest" Kind="Class" />
       <Type Name="Sms" Kind="Class" />
       <Type Name="SmsMessage" Kind="Class" />

From 4599c20b3c7f85ee85f36ce1b11bfb3be0a7bf90 Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Fri, 2 Nov 2018 16:19:26 -0700
Subject: [PATCH 11/43] Added Default and set it to Medium

---
 .../Samples/ViewModel/GeolocationViewModel.cs |  2 +-
 .../Geolocation/Geolocation.android.cs        |  1 +
 .../Geolocation/GeolocationRequest.ios.cs     |  1 +
 .../Geolocation/GeolocationRequest.shared.cs  | 15 ++--
 .../Geolocation/GeolocationRequest.uwp.cs     |  1 +
 .../xamarin-essentials-android.xml            |  5 +-
 .../xamarin-essentials-ios.xml                |  5 +-
 .../xamarin-essentials-uwp.xml                |  5 +-
 .../en/FrameworksIndex/xamarin-essentials.xml |  5 +-
 .../GeolocationAccuracy.xml                   | 71 ++++++++++++-------
 10 files changed, 69 insertions(+), 42 deletions(-)

diff --git a/Samples/Samples/ViewModel/GeolocationViewModel.cs b/Samples/Samples/ViewModel/GeolocationViewModel.cs
index ab3438c7e..09c85ed3f 100644
--- a/Samples/Samples/ViewModel/GeolocationViewModel.cs
+++ b/Samples/Samples/ViewModel/GeolocationViewModel.cs
@@ -11,7 +11,7 @@ public class GeolocationViewModel : BaseViewModel
         string notAvailable = "not available";
         string lastLocation;
         string currentLocation;
-        int accuracy = (int)GeolocationAccuracy.Medium;
+        int accuracy = (int)GeolocationAccuracy.Default;
         CancellationTokenSource cts;
 
         public GeolocationViewModel()
diff --git a/Xamarin.Essentials/Geolocation/Geolocation.android.cs b/Xamarin.Essentials/Geolocation/Geolocation.android.cs
index 36ab090aa..290f5f5ea 100644
--- a/Xamarin.Essentials/Geolocation/Geolocation.android.cs
+++ b/Xamarin.Essentials/Geolocation/Geolocation.android.cs
@@ -134,6 +134,7 @@ void RemoveUpdates()
                     criteria.PowerRequirement = LocationPower.Low;
                     accuracyDistance = 500;
                     break;
+                case GeolocationAccuracy.Default:
                 case GeolocationAccuracy.Medium:
                     criteria.Accuracy = Accuracy.Coarse;
                     criteria.HorizontalAccuracy = Accuracy.Medium;
diff --git a/Xamarin.Essentials/Geolocation/GeolocationRequest.ios.cs b/Xamarin.Essentials/Geolocation/GeolocationRequest.ios.cs
index 72701f92a..0ed9afa10 100644
--- a/Xamarin.Essentials/Geolocation/GeolocationRequest.ios.cs
+++ b/Xamarin.Essentials/Geolocation/GeolocationRequest.ios.cs
@@ -17,6 +17,7 @@ internal double PlatformDesiredAccuracy
                         return CLLocation.AccuracyThreeKilometers;
                     case GeolocationAccuracy.Low:
                         return CLLocation.AccuracyKilometer;
+                    case GeolocationAccuracy.Default:
                     case GeolocationAccuracy.Medium:
                         return CLLocation.AccuracyHundredMeters;
                     case GeolocationAccuracy.High:
diff --git a/Xamarin.Essentials/Geolocation/GeolocationRequest.shared.cs b/Xamarin.Essentials/Geolocation/GeolocationRequest.shared.cs
index 30a906f1e..67522f59b 100644
--- a/Xamarin.Essentials/Geolocation/GeolocationRequest.shared.cs
+++ b/Xamarin.Essentials/Geolocation/GeolocationRequest.shared.cs
@@ -4,30 +4,33 @@ namespace Xamarin.Essentials
 {
     public enum GeolocationAccuracy
     {
+        // Default is Medium
+        Default = 0,
+
         // iOS:     ThreeKilometers         (3000m)
         // Android: ACCURACY_LOW, POWER_LOW (500m)
         // UWP:     3000                    (1000-5000m)
-        Lowest,
+        Lowest = 1,
 
         // iOS:     Kilometer               (1000m)
         // Android: ACCURACY_LOW, POWER_MED (500m)
         // UWP:     1000                    (300-3000m)
-        Low,
+        Low = 2,
 
         // iOS:     HundredMeters           (100m)
         // Android: ACCURACY_MED, POWER_MED (100-500m)
         // UWP:     100                     (30-500m)
-        Medium,
+        Medium = 3,
 
         // iOS:     NearestTenMeters        (10m)
         // Android: ACCURACY_HI, POWER_MED  (0-100m)
         // UWP:     High                    (<=10m)
-        High,
+        High = 4,
 
         // iOS:     Best                    (0m)
         // Android: ACCURACY_HI, POWER_HI   (0-100m)
         // UWP:     High                    (<=10m)
-        Best
+        Best = 5
     }
 
     public partial class GeolocationRequest
@@ -35,7 +38,7 @@ public partial class GeolocationRequest
         public GeolocationRequest()
         {
             Timeout = TimeSpan.Zero;
-            DesiredAccuracy = GeolocationAccuracy.Medium;
+            DesiredAccuracy = GeolocationAccuracy.Default;
         }
 
         public GeolocationRequest(GeolocationAccuracy accuracy)
diff --git a/Xamarin.Essentials/Geolocation/GeolocationRequest.uwp.cs b/Xamarin.Essentials/Geolocation/GeolocationRequest.uwp.cs
index dde1e50b7..b799f1032 100644
--- a/Xamarin.Essentials/Geolocation/GeolocationRequest.uwp.cs
+++ b/Xamarin.Essentials/Geolocation/GeolocationRequest.uwp.cs
@@ -16,6 +16,7 @@ internal uint PlatformDesiredAccuracy
                         return 3000;
                     case GeolocationAccuracy.Low:
                         return 1000;
+                    case GeolocationAccuracy.Default:
                     case GeolocationAccuracy.Medium:
                         return 100;
                     case GeolocationAccuracy.High:
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-android.xml b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
index cf33dd2da..95106cf8a 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-android.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
@@ -222,11 +222,12 @@
       <Member Id="M:Xamarin.Essentials.Geolocation.GetLocationAsync(Xamarin.Essentials.GeolocationRequest,System.Threading.CancellationToken)" />
     </Type>
     <Type Name="Xamarin.Essentials.GeolocationAccuracy" Id="T:Xamarin.Essentials.GeolocationAccuracy">
-      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Best" />
-      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.High" />
+      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Default" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Low" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Lowest" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Medium" />
+      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.High" />
+      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Best" />
     </Type>
     <Type Name="Xamarin.Essentials.GeolocationRequest" Id="T:Xamarin.Essentials.GeolocationRequest">
       <Member Id="M:Xamarin.Essentials.GeolocationRequest.#ctor" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
index 2412c1c85..8bd70317c 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
@@ -223,11 +223,12 @@
       <Member Id="M:Xamarin.Essentials.Geolocation.GetLocationAsync(Xamarin.Essentials.GeolocationRequest,System.Threading.CancellationToken)" />
     </Type>
     <Type Name="Xamarin.Essentials.GeolocationAccuracy" Id="T:Xamarin.Essentials.GeolocationAccuracy">
-      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Best" />
-      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.High" />
+      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Default" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Low" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Lowest" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Medium" />
+      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.High" />
+      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Best" />
     </Type>
     <Type Name="Xamarin.Essentials.GeolocationRequest" Id="T:Xamarin.Essentials.GeolocationRequest">
       <Member Id="M:Xamarin.Essentials.GeolocationRequest.#ctor" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
index 09dcad344..eaf66ca12 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
@@ -222,11 +222,12 @@
       <Member Id="M:Xamarin.Essentials.Geolocation.GetLocationAsync(Xamarin.Essentials.GeolocationRequest,System.Threading.CancellationToken)" />
     </Type>
     <Type Name="Xamarin.Essentials.GeolocationAccuracy" Id="T:Xamarin.Essentials.GeolocationAccuracy">
-      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Best" />
-      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.High" />
+      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Default" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Low" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Lowest" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Medium" />
+      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.High" />
+      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Best" />
     </Type>
     <Type Name="Xamarin.Essentials.GeolocationRequest" Id="T:Xamarin.Essentials.GeolocationRequest">
       <Member Id="M:Xamarin.Essentials.GeolocationRequest.#ctor" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials.xml b/docs/en/FrameworksIndex/xamarin-essentials.xml
index 49195f6de..d7bcc6bbd 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials.xml
@@ -222,11 +222,12 @@
       <Member Id="M:Xamarin.Essentials.Geolocation.GetLocationAsync(Xamarin.Essentials.GeolocationRequest,System.Threading.CancellationToken)" />
     </Type>
     <Type Name="Xamarin.Essentials.GeolocationAccuracy" Id="T:Xamarin.Essentials.GeolocationAccuracy">
-      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Best" />
-      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.High" />
+      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Default" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Low" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Lowest" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Medium" />
+      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.High" />
+      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Best" />
     </Type>
     <Type Name="Xamarin.Essentials.GeolocationRequest" Id="T:Xamarin.Essentials.GeolocationRequest">
       <Member Id="M:Xamarin.Essentials.GeolocationRequest.#ctor" />
diff --git a/docs/en/Xamarin.Essentials/GeolocationAccuracy.xml b/docs/en/Xamarin.Essentials/GeolocationAccuracy.xml
index 2c5f8b46e..3264a5d0f 100644
--- a/docs/en/Xamarin.Essentials/GeolocationAccuracy.xml
+++ b/docs/en/Xamarin.Essentials/GeolocationAccuracy.xml
@@ -14,10 +14,10 @@
     <remarks></remarks>
   </Docs>
   <Members>
-    <Member MemberName="Best">
-      <MemberSignature Language="C#" Value="Best" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.GeolocationAccuracy Best = int32(4)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.GeolocationAccuracy.Best" />
+      <Member MemberName="Default">
+      <MemberSignature Language="C#" Value="Default" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.GeolocationAccuracy Default = int32(0)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.GeolocationAccuracy.Default" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -26,26 +26,9 @@
       <ReturnValue>
         <ReturnType>Xamarin.Essentials.GeolocationAccuracy</ReturnType>
       </ReturnValue>
-      <MemberValue>4</MemberValue>
-      <Docs>
-        <summary>Represents the best accuracy, using the most power to obtain and typically within 10 meters.</summary>
-      </Docs>
-    </Member>
-    <Member MemberName="High">
-      <MemberSignature Language="C#" Value="High" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.GeolocationAccuracy High = int32(3)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.GeolocationAccuracy.High" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>Xamarin.Essentials.GeolocationAccuracy</ReturnType>
-      </ReturnValue>
-      <MemberValue>3</MemberValue>
+      <MemberValue>0</MemberValue>
       <Docs>
-        <summary>Represents high accuracy, typically within 10-100 meters.</summary>
+        <summary>Represents default accuracy (Medium), typically within 30-500 meters.</summary>
       </Docs>
     </Member>
     <Member MemberName="Low">
@@ -67,7 +50,7 @@
     </Member>
     <Member MemberName="Lowest">
       <MemberSignature Language="C#" Value="Lowest" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.GeolocationAccuracy Lowest = int32(0)" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.GeolocationAccuracy Lowest = int32(2)" />
       <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.GeolocationAccuracy.Lowest" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
@@ -77,14 +60,14 @@
       <ReturnValue>
         <ReturnType>Xamarin.Essentials.GeolocationAccuracy</ReturnType>
       </ReturnValue>
-      <MemberValue>0</MemberValue>
+      <MemberValue>2</MemberValue>
       <Docs>
         <summary>Represents the lowest accuracy, using the least power to obtain and typically within 1000-5000 meters.</summary>
       </Docs>
     </Member>
     <Member MemberName="Medium">
       <MemberSignature Language="C#" Value="Medium" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.GeolocationAccuracy Medium = int32(2)" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.GeolocationAccuracy Medium = int32(3)" />
       <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.GeolocationAccuracy.Medium" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
@@ -94,10 +77,44 @@
       <ReturnValue>
         <ReturnType>Xamarin.Essentials.GeolocationAccuracy</ReturnType>
       </ReturnValue>
-      <MemberValue>2</MemberValue>
+      <MemberValue>3</MemberValue>
       <Docs>
         <summary>Represents medium accuracy, typically within 30-500 meters.</summary>
       </Docs>
     </Member>
+    <Member MemberName="High">
+      <MemberSignature Language="C#" Value="High" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.GeolocationAccuracy High = int32(4)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.GeolocationAccuracy.High" />
+      <MemberType>Field</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Xamarin.Essentials.GeolocationAccuracy</ReturnType>
+      </ReturnValue>
+      <MemberValue>4</MemberValue>
+      <Docs>
+        <summary>Represents high accuracy, typically within 10-100 meters.</summary>
+      </Docs>
+    </Member>
+    <Member MemberName="Best">
+      <MemberSignature Language="C#" Value="Best" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.GeolocationAccuracy Best = int32(5)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.GeolocationAccuracy.Best" />
+      <MemberType>Field</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Xamarin.Essentials.GeolocationAccuracy</ReturnType>
+      </ReturnValue>
+      <MemberValue>5</MemberValue>
+      <Docs>
+        <summary>Represents the best accuracy, using the most power to obtain and typically within 10 meters.</summary>
+      </Docs>
+    </Member>
   </Members>
 </Type>

From de6bf4987fe32c865a0d80074c17fa7c1d4b0558 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sat, 3 Nov 2018 01:24:12 +0200
Subject: [PATCH 12/43] [Platform] Remove the Platform for .net standard since
 it does nothing (#592)

- closes #579
---
 Xamarin.Essentials/Platform/Platform.shared.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Xamarin.Essentials/Platform/Platform.shared.cs b/Xamarin.Essentials/Platform/Platform.shared.cs
index 871d3e02e..b946b4c87 100644
--- a/Xamarin.Essentials/Platform/Platform.shared.cs
+++ b/Xamarin.Essentials/Platform/Platform.shared.cs
@@ -1,6 +1,8 @@
 namespace Xamarin.Essentials
 {
+#if !NETSTANDARD
     public static partial class Platform
     {
     }
+#endif
 }

From 98c4a9e6d413907fc98912d31ce41b37a1a88a97 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sat, 3 Nov 2018 01:25:19 +0200
Subject: [PATCH 13/43] GH-583: [api-fix] Power / Battery (#591)

* Move the `Power` members into `Battery` Closes #583

* [Battery] If the charge can be determined, return 1.0
 - if the device is on, then it must have some charge
 - chances are, the issue is that there is no battery at all (on power)
 - closes #583
---
 .../DeviceTests.Shared/Battery_Tests.cs       |  6 ++
 DeviceTests/DeviceTests.Shared/Power_Tests.cs | 14 ----
 README.md                                     |  1 -
 Samples/Samples/ViewModel/BatteryViewModel.cs |  6 +-
 Xamarin.Essentials/Battery/Battery.android.cs | 60 ++++++++++++++++-
 Xamarin.Essentials/Battery/Battery.ios.cs     | 18 +++++
 .../Battery/Battery.netstandard.cs            |  9 +++
 Xamarin.Essentials/Battery/Battery.shared.cs  | 56 ++++++++++++++++
 Xamarin.Essentials/Battery/Battery.uwp.cs     | 26 ++++++--
 Xamarin.Essentials/Power/Power.android.cs     | 66 -------------------
 Xamarin.Essentials/Power/Power.ios.cs         | 27 --------
 Xamarin.Essentials/Power/Power.netstandard.cs | 14 ----
 Xamarin.Essentials/Power/Power.shared.cs      | 60 -----------------
 Xamarin.Essentials/Power/Power.uwp.cs         | 23 -------
 .../xamarin-essentials-android.xml            |  7 +-
 .../xamarin-essentials-ios.xml                |  7 +-
 .../xamarin-essentials-uwp.xml                |  7 +-
 .../en/FrameworksIndex/xamarin-essentials.xml |  7 +-
 docs/en/Xamarin.Essentials/Battery.xml        | 39 +++++++++++
 .../EnergySaverStatusChangedEventArgs.xml     | 19 ++++++
 docs/en/Xamarin.Essentials/Power.xml          | 60 -----------------
 docs/en/index.xml                             |  1 -
 22 files changed, 239 insertions(+), 294 deletions(-)
 delete mode 100644 DeviceTests/DeviceTests.Shared/Power_Tests.cs
 delete mode 100644 Xamarin.Essentials/Power/Power.android.cs
 delete mode 100644 Xamarin.Essentials/Power/Power.ios.cs
 delete mode 100644 Xamarin.Essentials/Power/Power.netstandard.cs
 delete mode 100644 Xamarin.Essentials/Power/Power.shared.cs
 delete mode 100644 Xamarin.Essentials/Power/Power.uwp.cs
 delete mode 100644 docs/en/Xamarin.Essentials/Power.xml

diff --git a/DeviceTests/DeviceTests.Shared/Battery_Tests.cs b/DeviceTests/DeviceTests.Shared/Battery_Tests.cs
index 592a75178..ca11c6c78 100644
--- a/DeviceTests/DeviceTests.Shared/Battery_Tests.cs
+++ b/DeviceTests/DeviceTests.Shared/Battery_Tests.cs
@@ -42,5 +42,11 @@ public void Charge_Power()
 
             Assert.NotEqual(BatteryPowerSource.Unknown, Battery.PowerSource);
         }
+
+        [Fact]
+        public void App_Is_Not_Lower_Power_mode()
+        {
+            Assert.Equal(EnergySaverStatus.Off, Battery.EnergySaverStatus);
+        }
     }
 }
diff --git a/DeviceTests/DeviceTests.Shared/Power_Tests.cs b/DeviceTests/DeviceTests.Shared/Power_Tests.cs
deleted file mode 100644
index b1c7164b7..000000000
--- a/DeviceTests/DeviceTests.Shared/Power_Tests.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Xamarin.Essentials;
-using Xunit;
-
-namespace DeviceTests
-{
-    public class Power_Tests
-    {
-        [Fact]
-        public void App_Is_Not_Lower_Power_mode()
-        {
-            Assert.Equal(EnergySaverStatus.Off, Power.EnergySaverStatus);
-        }
-    }
-}
diff --git a/README.md b/README.md
index 300ec98ef..fe2bc3d4b 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,6 @@ The following cross-platform APIs are available in Xamarin.Essentials:
 * [Open Browser](https://docs.microsoft.com/xamarin/essentials/open-browser)
 * [Orientation Sensor](https://docs.microsoft.com/en-us/xamarin/essentials/orientation-sensor)
 * [Phone Dialer](https://docs.microsoft.com/xamarin/essentials/phone-dialer)
-* [Power](https://docs.microsoft.com/en-us/xamarin/essentials/power)
 * [Preferences](https://docs.microsoft.com/xamarin/essentials/preferences)
 * [Screen Lock](https://docs.microsoft.com/xamarin/essentials/screen-lock)
 * [Secure Storage](https://docs.microsoft.com/xamarin/essentials/secure-storage)
diff --git a/Samples/Samples/ViewModel/BatteryViewModel.cs b/Samples/Samples/ViewModel/BatteryViewModel.cs
index eb93dc6d5..0cd492bf2 100644
--- a/Samples/Samples/ViewModel/BatteryViewModel.cs
+++ b/Samples/Samples/ViewModel/BatteryViewModel.cs
@@ -14,20 +14,20 @@ public BatteryViewModel()
 
         public BatteryPowerSource PowerSource => Battery.PowerSource;
 
-        public EnergySaverStatus EnergySaverStatus => Power.EnergySaverStatus;
+        public EnergySaverStatus EnergySaverStatus => Battery.EnergySaverStatus;
 
         public override void OnAppearing()
         {
             base.OnAppearing();
 
             Battery.BatteryChanged += OnBatteryChanged;
-            Power.EnergySaverStatusChanged += OnEnergySaverStatusChanged;
+            Battery.EnergySaverStatusChanged += OnEnergySaverStatusChanged;
         }
 
         public override void OnDisappearing()
         {
             Battery.BatteryChanged -= OnBatteryChanged;
-            Power.EnergySaverStatusChanged -= OnEnergySaverStatusChanged;
+            Battery.EnergySaverStatusChanged -= OnEnergySaverStatusChanged;
 
             base.OnDisappearing();
         }
diff --git a/Xamarin.Essentials/Battery/Battery.android.cs b/Xamarin.Essentials/Battery/Battery.android.cs
index 041c147c2..66eab560b 100644
--- a/Xamarin.Essentials/Battery/Battery.android.cs
+++ b/Xamarin.Essentials/Battery/Battery.android.cs
@@ -1,13 +1,51 @@
 using System;
 using Android.Content;
 using Android.OS;
-using Debug = System.Diagnostics.Debug;
 
 namespace Xamarin.Essentials
 {
     public static partial class Battery
     {
         static BatteryBroadcastReceiver batteryReceiver;
+        static EnergySaverBroadcastReceiver powerReceiver;
+
+        static void StartEnergySaverListeners()
+        {
+            if (!Platform.HasApiLevel(BuildVersionCodes.Lollipop))
+                return;
+
+            powerReceiver = new EnergySaverBroadcastReceiver(OnEnergySaverChanged);
+            Platform.AppContext.RegisterReceiver(powerReceiver, new IntentFilter(PowerManager.ActionPowerSaveModeChanged));
+        }
+
+        static void StopEnergySaverListeners()
+        {
+            if (!Platform.HasApiLevel(BuildVersionCodes.Lollipop))
+                return;
+
+            try
+            {
+                Platform.AppContext.UnregisterReceiver(powerReceiver);
+            }
+            catch (Java.Lang.IllegalArgumentException)
+            {
+                System.Diagnostics.Debug.WriteLine("Energy saver receiver already unregistered. Disposing of it.");
+            }
+            powerReceiver.Dispose();
+            powerReceiver = null;
+        }
+
+        static EnergySaverStatus PlatformEnergySaverStatus
+        {
+            get
+            {
+                var status = false;
+                if (Platform.HasApiLevel(BuildVersionCodes.Lollipop))
+                    status = Platform.PowerManager?.IsPowerSaveMode ?? false;
+
+                return status ? EnergySaverStatus.On : EnergySaverStatus.Off;
+            }
+        }
 
         static void StartBatteryListeners()
         {
@@ -25,7 +63,7 @@ static void StopBatteryListeners()
             }
             catch (Java.Lang.IllegalArgumentException)
             {
-                Debug.WriteLine("Battery receiver already unregistered. Disposing of it.");
+                System.Diagnostics.Debug.WriteLine("Battery receiver already unregistered. Disposing of it.");
             }
             batteryReceiver.Dispose();
             batteryReceiver = null;
@@ -44,7 +82,7 @@ static double PlatformChargeLevel
                     var scale = battery.GetIntExtra(BatteryManager.ExtraScale, -1);
 
                     if (scale <= 0)
-                        return -1;
+                        return 1.0;
 
                     return (double)level / (double)scale;
                 }
@@ -119,4 +157,20 @@ public BatteryBroadcastReceiver(Action onChanged) =>
         public override void OnReceive(Context context, Intent intent) =>
             onChanged?.Invoke();
     }
+
+    [BroadcastReceiver(Enabled = true, Exported = false, Label = "Essentials Energy Saver Broadcast Receiver")]
+    class EnergySaverBroadcastReceiver : BroadcastReceiver
+    {
+        Action onChanged;
+
+        public EnergySaverBroadcastReceiver()
+        {
+        }
+
+        public EnergySaverBroadcastReceiver(Action onChanged) =>
+            this.onChanged = onChanged;
+
+        public override void OnReceive(Context context, Intent intent) =>
+            onChanged?.Invoke();
+    }
 }
diff --git a/Xamarin.Essentials/Battery/Battery.ios.cs b/Xamarin.Essentials/Battery/Battery.ios.cs
index 5945b0cd6..2296ae98d 100644
--- a/Xamarin.Essentials/Battery/Battery.ios.cs
+++ b/Xamarin.Essentials/Battery/Battery.ios.cs
@@ -7,6 +7,24 @@ public static partial class Battery
     {
         static NSObject levelObserver;
         static NSObject stateObserver;
+        static NSObject saverStatusObserver;
+
+        static void StartEnergySaverListeners()
+        {
+            saverStatusObserver = NSNotificationCenter.DefaultCenter.AddObserver(NSProcessInfo.PowerStateDidChangeNotification, PowerChangedNotification);
+        }
+
+        static void StopEnergySaverListeners()
+        {
+            saverStatusObserver?.Dispose();
+            saverStatusObserver = null;
+        }
+
+        static void PowerChangedNotification(NSNotification notification)
+            => MainThread.BeginInvokeOnMainThread(OnEnergySaverChanged);
+
+        static EnergySaverStatus PlatformEnergySaverStatus =>
+            NSProcessInfo.ProcessInfo?.LowPowerModeEnabled == true ? EnergySaverStatus.On : EnergySaverStatus.Off;
 
         static void StartBatteryListeners()
         {
diff --git a/Xamarin.Essentials/Battery/Battery.netstandard.cs b/Xamarin.Essentials/Battery/Battery.netstandard.cs
index 1b6c7b2bf..f4021e715 100644
--- a/Xamarin.Essentials/Battery/Battery.netstandard.cs
+++ b/Xamarin.Essentials/Battery/Battery.netstandard.cs
@@ -16,5 +16,14 @@ static void StopBatteryListeners() =>
 
         static BatteryPowerSource PlatformPowerSource =>
             throw new NotImplementedInReferenceAssemblyException();
+
+        static void StartEnergySaverListeners() =>
+            throw new NotImplementedInReferenceAssemblyException();
+
+        static void StopEnergySaverListeners() =>
+            throw new NotImplementedInReferenceAssemblyException();
+
+        static EnergySaverStatus PlatformEnergySaverStatus =>
+            throw new NotImplementedInReferenceAssemblyException();
     }
 }
diff --git a/Xamarin.Essentials/Battery/Battery.shared.cs b/Xamarin.Essentials/Battery/Battery.shared.cs
index 6d117b0ca..a4e980fc0 100644
--- a/Xamarin.Essentials/Battery/Battery.shared.cs
+++ b/Xamarin.Essentials/Battery/Battery.shared.cs
@@ -6,6 +6,8 @@ public static partial class Battery
     {
         static event EventHandler<BatteryChangedEventArgs> BatteryChangedInternal;
 
+        static event EventHandler<EnergySaverStatusChangedEventArgs> EnergySaverStatusChangedInternal;
+
         // a cache so that events aren't fired unnecessarily
         // this is mainly an issue on Android, but we can stiil do this everywhere
         static double currentLevel;
@@ -18,6 +20,8 @@ public static partial class Battery
 
         public static BatteryPowerSource PowerSource => PlatformPowerSource;
 
+        public static EnergySaverStatus EnergySaverStatus => PlatformEnergySaverStatus;
+
         public static event EventHandler<BatteryChangedEventArgs> BatteryChanged
         {
             add
@@ -44,6 +48,29 @@ public static event EventHandler<BatteryChangedEventArgs> BatteryChanged
             }
         }
 
+        public static event EventHandler<EnergySaverStatusChangedEventArgs> EnergySaverStatusChanged
+        {
+            add
+            {
+                var wasRunning = EnergySaverStatusChangedInternal != null;
+
+                EnergySaverStatusChangedInternal += value;
+
+                if (!wasRunning && EnergySaverStatusChangedInternal != null)
+                    StartEnergySaverListeners();
+            }
+
+            remove
+            {
+                var wasRunning = EnergySaverStatusChangedInternal != null;
+
+                EnergySaverStatusChangedInternal -= value;
+
+                if (wasRunning && EnergySaverStatusChangedInternal == null)
+                    StopEnergySaverListeners();
+            }
+        }
+
         static void SetCurrent()
         {
             currentLevel = Battery.ChargeLevel;
@@ -65,6 +92,15 @@ static void OnBatteryChanged(BatteryChangedEventArgs e)
                 BatteryChangedInternal?.Invoke(null, e);
             }
         }
+
+        static void OnEnergySaverChanged()
+            => OnEnergySaverChanged(EnergySaverStatus);
+
+        static void OnEnergySaverChanged(EnergySaverStatus saverStatus)
+            => OnEnergySaverChanged(new EnergySaverStatusChangedEventArgs(saverStatus));
+
+        static void OnEnergySaverChanged(EnergySaverStatusChangedEventArgs e)
+            => EnergySaverStatusChangedInternal?.Invoke(null, e);
     }
 
     public enum BatteryState
@@ -86,6 +122,13 @@ public enum BatteryPowerSource
         Wireless
     }
 
+    public enum EnergySaverStatus
+    {
+        Unknown,
+        On,
+        Off
+    }
+
     public class BatteryChangedEventArgs : EventArgs
     {
         internal BatteryChangedEventArgs(double level, BatteryState state, BatteryPowerSource source)
@@ -106,4 +149,17 @@ public override string ToString() =>
             $"{nameof(State)}: {State}, " +
             $"{nameof(PowerSource)}: {PowerSource}";
     }
+
+    public class EnergySaverStatusChangedEventArgs : EventArgs
+    {
+        internal EnergySaverStatusChangedEventArgs(EnergySaverStatus saverStatus)
+        {
+            EnergySaverStatus = saverStatus;
+        }
+
+        public EnergySaverStatus EnergySaverStatus { get; }
+
+        public override string ToString() =>
+            $"{nameof(EnergySaverStatus)}: {EnergySaverStatus}";
+    }
 }
diff --git a/Xamarin.Essentials/Battery/Battery.uwp.cs b/Xamarin.Essentials/Battery/Battery.uwp.cs
index 24a80d858..93c5856a5 100644
--- a/Xamarin.Essentials/Battery/Battery.uwp.cs
+++ b/Xamarin.Essentials/Battery/Battery.uwp.cs
@@ -1,7 +1,18 @@
-namespace Xamarin.Essentials
+using Windows.System.Power;
+
+namespace Xamarin.Essentials
 {
     public static partial class Battery
     {
+        static void StartEnergySaverListeners() =>
+            PowerManager.EnergySaverStatusChanged += ReportEnergySaverUpdated;
+
+        static void StopEnergySaverListeners() =>
+            PowerManager.EnergySaverStatusChanged -= ReportEnergySaverUpdated;
+
+        static void ReportEnergySaverUpdated(object sender, object e)
+            => MainThread.BeginInvokeOnMainThread(OnEnergySaverChanged);
+
         static void StartBatteryListeners() =>
             DefaultBattery.ReportUpdated += ReportUpdated;
 
@@ -19,7 +30,7 @@ static double PlatformChargeLevel
             get
             {
                 var finalReport = DefaultBattery.GetReport();
-                var finalPercent = -1.0;
+                var finalPercent = 1.0;
 
                 var remaining = finalReport.RemainingCapacityInMilliwattHours;
                 var full = finalReport.FullChargeCapacityInMilliwattHours;
@@ -39,15 +50,15 @@ static BatteryState PlatformState
 
                 switch (report.Status)
                 {
-                    case Windows.System.Power.BatteryStatus.Charging:
+                    case BatteryStatus.Charging:
                         return BatteryState.Charging;
-                    case Windows.System.Power.BatteryStatus.Discharging:
+                    case BatteryStatus.Discharging:
                         return BatteryState.Discharging;
-                    case Windows.System.Power.BatteryStatus.Idle:
+                    case BatteryStatus.Idle:
                         if (ChargeLevel >= 1.0)
                             return BatteryState.Full;
                         return BatteryState.NotCharging;
-                    case Windows.System.Power.BatteryStatus.NotPresent:
+                    case BatteryStatus.NotPresent:
                         return BatteryState.NotPresent;
                 }
 
@@ -75,5 +86,8 @@ static BatteryPowerSource PlatformPowerSource
                 }
             }
         }
+
+        static EnergySaverStatus PlatformEnergySaverStatus =>
+            PowerManager.EnergySaverStatus == Windows.System.Power.EnergySaverStatus.On ? EnergySaverStatus.On : EnergySaverStatus.Off;
     }
 }
diff --git a/Xamarin.Essentials/Power/Power.android.cs b/Xamarin.Essentials/Power/Power.android.cs
deleted file mode 100644
index 2c5e8c0db..000000000
--- a/Xamarin.Essentials/Power/Power.android.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System;
-using Android.Content;
-using Android.OS;
-using Debug = System.Diagnostics.Debug;
-
-namespace Xamarin.Essentials
-{
-    public static partial class Power
-    {
-        static PowerBroadcastReceiver powerReceiver;
-
-        static void StartPowerListeners()
-        {
-            if (!Platform.HasApiLevel(BuildVersionCodes.Lollipop))
-                return;
-
-            powerReceiver = new PowerBroadcastReceiver(OnPowerChanged);
-            Platform.AppContext.RegisterReceiver(powerReceiver, new IntentFilter(PowerManager.ActionPowerSaveModeChanged));
-        }
-
-        static void StopPowerListeners()
-        {
-            if (!Platform.HasApiLevel(BuildVersionCodes.Lollipop))
-                return;
-
-            try
-            {
-                Platform.AppContext.UnregisterReceiver(powerReceiver);
-            }
-            catch (Java.Lang.IllegalArgumentException)
-            {
-                Debug.WriteLine("Power receiver already unregistered. Disposing of it.");
-            }
-            powerReceiver.Dispose();
-            powerReceiver = null;
-        }
-
-        static EnergySaverStatus PlatformEnergySaverStatus
-        {
-            get
-            {
-                var status = false;
-                if (Platform.HasApiLevel(BuildVersionCodes.Lollipop))
-                    status = Platform.PowerManager?.IsPowerSaveMode ?? false;
-
-                return status ? EnergySaverStatus.On : EnergySaverStatus.Off;
-            }
-        }
-    }
-
-    [BroadcastReceiver(Enabled = true, Exported = false, Label = "Essentials Power Broadcast Receiver")]
-    class PowerBroadcastReceiver : BroadcastReceiver
-    {
-        Action onChanged;
-
-        public PowerBroadcastReceiver()
-        {
-        }
-
-        public PowerBroadcastReceiver(Action onChanged) =>
-            this.onChanged = onChanged;
-
-        public override void OnReceive(Context context, Intent intent) =>
-            onChanged?.Invoke();
-    }
-}
diff --git a/Xamarin.Essentials/Power/Power.ios.cs b/Xamarin.Essentials/Power/Power.ios.cs
deleted file mode 100644
index 8901e992d..000000000
--- a/Xamarin.Essentials/Power/Power.ios.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Foundation;
-using UIKit;
-
-namespace Xamarin.Essentials
-{
-    public static partial class Power
-    {
-        static NSObject saverStatusObserver;
-
-        static void StartPowerListeners()
-        {
-            saverStatusObserver = NSNotificationCenter.DefaultCenter.AddObserver(NSProcessInfo.PowerStateDidChangeNotification, PowerChangedNotification);
-        }
-
-        static void StopPowerListeners()
-        {
-            saverStatusObserver?.Dispose();
-            saverStatusObserver = null;
-        }
-
-        static void PowerChangedNotification(NSNotification notification)
-            => MainThread.BeginInvokeOnMainThread(OnPowerChanged);
-
-        static EnergySaverStatus PlatformEnergySaverStatus =>
-            NSProcessInfo.ProcessInfo?.LowPowerModeEnabled == true ? EnergySaverStatus.On : EnergySaverStatus.Off;
-    }
-}
diff --git a/Xamarin.Essentials/Power/Power.netstandard.cs b/Xamarin.Essentials/Power/Power.netstandard.cs
deleted file mode 100644
index 3d36439a2..000000000
--- a/Xamarin.Essentials/Power/Power.netstandard.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Xamarin.Essentials
-{
-    public static partial class Power
-    {
-        static void StartPowerListeners() =>
-            throw new NotImplementedInReferenceAssemblyException();
-
-        static void StopPowerListeners() =>
-            throw new NotImplementedInReferenceAssemblyException();
-
-        static EnergySaverStatus PlatformEnergySaverStatus =>
-            throw new NotImplementedInReferenceAssemblyException();
-    }
-}
diff --git a/Xamarin.Essentials/Power/Power.shared.cs b/Xamarin.Essentials/Power/Power.shared.cs
deleted file mode 100644
index f22a93ec3..000000000
--- a/Xamarin.Essentials/Power/Power.shared.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-
-namespace Xamarin.Essentials
-{
-    public static partial class Power
-    {
-        static event EventHandler<EnergySaverStatusChangedEventArgs> EnergySaverStatusChangedInternal;
-
-        public static EnergySaverStatus EnergySaverStatus => PlatformEnergySaverStatus;
-
-        public static event EventHandler<EnergySaverStatusChangedEventArgs> EnergySaverStatusChanged
-        {
-            add
-            {
-                var wasRunning = EnergySaverStatusChangedInternal != null;
-
-                EnergySaverStatusChangedInternal += value;
-
-                if (!wasRunning && EnergySaverStatusChangedInternal != null)
-                    StartPowerListeners();
-            }
-
-            remove
-            {
-                var wasRunning = EnergySaverStatusChangedInternal != null;
-
-                EnergySaverStatusChangedInternal -= value;
-
-                if (wasRunning && EnergySaverStatusChangedInternal == null)
-                    StopPowerListeners();
-            }
-        }
-
-        static void OnPowerChanged()
-            => OnPowerChanged(EnergySaverStatus);
-
-        static void OnPowerChanged(EnergySaverStatus saverStatus)
-            => OnPowerChanged(new EnergySaverStatusChangedEventArgs(saverStatus));
-
-        static void OnPowerChanged(EnergySaverStatusChangedEventArgs e)
-            => EnergySaverStatusChangedInternal?.Invoke(null, e);
-    }
-
-    public enum EnergySaverStatus
-    {
-        Unknown,
-        On,
-        Off
-    }
-
-    public class EnergySaverStatusChangedEventArgs : EventArgs
-    {
-        internal EnergySaverStatusChangedEventArgs(EnergySaverStatus saverStatus)
-        {
-            EnergySaverStatus = saverStatus;
-        }
-
-        public EnergySaverStatus EnergySaverStatus { get; }
-    }
-}
diff --git a/Xamarin.Essentials/Power/Power.uwp.cs b/Xamarin.Essentials/Power/Power.uwp.cs
deleted file mode 100644
index 1f921e484..000000000
--- a/Xamarin.Essentials/Power/Power.uwp.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Windows.System.Power;
-
-namespace Xamarin.Essentials
-{
-    public static partial class Power
-    {
-        static void StartPowerListeners()
-        {
-            PowerManager.EnergySaverStatusChanged += ReportUpdated;
-        }
-
-        static void StopPowerListeners()
-        {
-            PowerManager.EnergySaverStatusChanged -= ReportUpdated;
-        }
-
-        static void ReportUpdated(object sender, object e)
-            => MainThread.BeginInvokeOnMainThread(OnPowerChanged);
-
-        static EnergySaverStatus PlatformEnergySaverStatus =>
-            PowerManager.EnergySaverStatus == Windows.System.Power.EnergySaverStatus.On ? EnergySaverStatus.On : EnergySaverStatus.Off;
-    }
-}
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-android.xml b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
index a32ccc9dc..318ca01fb 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-android.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
@@ -49,7 +49,9 @@
     </Type>
     <Type Name="Xamarin.Essentials.Battery" Id="T:Xamarin.Essentials.Battery">
       <Member Id="E:Xamarin.Essentials.Battery.BatteryChanged" />
+      <Member Id="E:Xamarin.Essentials.Battery.EnergySaverStatusChanged" />
       <Member Id="P:Xamarin.Essentials.Battery.ChargeLevel" />
+      <Member Id="P:Xamarin.Essentials.Battery.EnergySaverStatus" />
       <Member Id="P:Xamarin.Essentials.Battery.PowerSource" />
       <Member Id="P:Xamarin.Essentials.Battery.State" />
     </Type>
@@ -185,6 +187,7 @@
       <Member Id="F:Xamarin.Essentials.EnergySaverStatus.Unknown" />
     </Type>
     <Type Name="Xamarin.Essentials.EnergySaverStatusChangedEventArgs" Id="T:Xamarin.Essentials.EnergySaverStatusChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.EnergySaverStatusChangedEventArgs.ToString" />
       <Member Id="P:Xamarin.Essentials.EnergySaverStatusChangedEventArgs.EnergySaverStatus" />
     </Type>
     <Type Name="Xamarin.Essentials.FeatureNotEnabledException" Id="T:Xamarin.Essentials.FeatureNotEnabledException">
@@ -390,10 +393,6 @@
       <Member Id="M:Xamarin.Essentials.Platform.Init(Android.App.Application)" />
       <Member Id="M:Xamarin.Essentials.Platform.OnRequestPermissionsResult(System.Int32,System.String[],Android.Content.PM.Permission[])" />
     </Type>
-    <Type Name="Xamarin.Essentials.Power" Id="T:Xamarin.Essentials.Power">
-      <Member Id="E:Xamarin.Essentials.Power.EnergySaverStatusChanged" />
-      <Member Id="P:Xamarin.Essentials.Power.EnergySaverStatus" />
-    </Type>
     <Type Name="Xamarin.Essentials.Preferences" Id="T:Xamarin.Essentials.Preferences">
       <Member Id="M:Xamarin.Essentials.Preferences.Clear" />
       <Member Id="M:Xamarin.Essentials.Preferences.Clear(System.String)" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
index 5b2921dd6..e1b589cea 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
@@ -49,7 +49,9 @@
     </Type>
     <Type Name="Xamarin.Essentials.Battery" Id="T:Xamarin.Essentials.Battery">
       <Member Id="E:Xamarin.Essentials.Battery.BatteryChanged" />
+      <Member Id="E:Xamarin.Essentials.Battery.EnergySaverStatusChanged" />
       <Member Id="P:Xamarin.Essentials.Battery.ChargeLevel" />
+      <Member Id="P:Xamarin.Essentials.Battery.EnergySaverStatus" />
       <Member Id="P:Xamarin.Essentials.Battery.PowerSource" />
       <Member Id="P:Xamarin.Essentials.Battery.State" />
     </Type>
@@ -186,6 +188,7 @@
       <Member Id="F:Xamarin.Essentials.EnergySaverStatus.Unknown" />
     </Type>
     <Type Name="Xamarin.Essentials.EnergySaverStatusChangedEventArgs" Id="T:Xamarin.Essentials.EnergySaverStatusChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.EnergySaverStatusChangedEventArgs.ToString" />
       <Member Id="P:Xamarin.Essentials.EnergySaverStatusChangedEventArgs.EnergySaverStatus" />
     </Type>
     <Type Name="Xamarin.Essentials.FeatureNotEnabledException" Id="T:Xamarin.Essentials.FeatureNotEnabledException">
@@ -387,10 +390,6 @@
       <Member Id="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapsLaunchOptions)" />
     </Type>
     <Type Name="Xamarin.Essentials.Platform" Id="T:Xamarin.Essentials.Platform" />
-    <Type Name="Xamarin.Essentials.Power" Id="T:Xamarin.Essentials.Power">
-      <Member Id="E:Xamarin.Essentials.Power.EnergySaverStatusChanged" />
-      <Member Id="P:Xamarin.Essentials.Power.EnergySaverStatus" />
-    </Type>
     <Type Name="Xamarin.Essentials.Preferences" Id="T:Xamarin.Essentials.Preferences">
       <Member Id="M:Xamarin.Essentials.Preferences.Clear" />
       <Member Id="M:Xamarin.Essentials.Preferences.Clear(System.String)" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
index 31a92f4b1..03e970803 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
@@ -49,7 +49,9 @@
     </Type>
     <Type Name="Xamarin.Essentials.Battery" Id="T:Xamarin.Essentials.Battery">
       <Member Id="E:Xamarin.Essentials.Battery.BatteryChanged" />
+      <Member Id="E:Xamarin.Essentials.Battery.EnergySaverStatusChanged" />
       <Member Id="P:Xamarin.Essentials.Battery.ChargeLevel" />
+      <Member Id="P:Xamarin.Essentials.Battery.EnergySaverStatus" />
       <Member Id="P:Xamarin.Essentials.Battery.PowerSource" />
       <Member Id="P:Xamarin.Essentials.Battery.State" />
     </Type>
@@ -185,6 +187,7 @@
       <Member Id="F:Xamarin.Essentials.EnergySaverStatus.Unknown" />
     </Type>
     <Type Name="Xamarin.Essentials.EnergySaverStatusChangedEventArgs" Id="T:Xamarin.Essentials.EnergySaverStatusChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.EnergySaverStatusChangedEventArgs.ToString" />
       <Member Id="P:Xamarin.Essentials.EnergySaverStatusChangedEventArgs.EnergySaverStatus" />
     </Type>
     <Type Name="Xamarin.Essentials.FeatureNotEnabledException" Id="T:Xamarin.Essentials.FeatureNotEnabledException">
@@ -388,10 +391,6 @@
     <Type Name="Xamarin.Essentials.Platform" Id="T:Xamarin.Essentials.Platform">
       <Member Id="P:Xamarin.Essentials.Platform.MapServiceToken" />
     </Type>
-    <Type Name="Xamarin.Essentials.Power" Id="T:Xamarin.Essentials.Power">
-      <Member Id="E:Xamarin.Essentials.Power.EnergySaverStatusChanged" />
-      <Member Id="P:Xamarin.Essentials.Power.EnergySaverStatus" />
-    </Type>
     <Type Name="Xamarin.Essentials.Preferences" Id="T:Xamarin.Essentials.Preferences">
       <Member Id="M:Xamarin.Essentials.Preferences.Clear" />
       <Member Id="M:Xamarin.Essentials.Preferences.Clear(System.String)" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials.xml b/docs/en/FrameworksIndex/xamarin-essentials.xml
index f100c51b2..4a2520f12 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials.xml
@@ -49,7 +49,9 @@
     </Type>
     <Type Name="Xamarin.Essentials.Battery" Id="T:Xamarin.Essentials.Battery">
       <Member Id="E:Xamarin.Essentials.Battery.BatteryChanged" />
+      <Member Id="E:Xamarin.Essentials.Battery.EnergySaverStatusChanged" />
       <Member Id="P:Xamarin.Essentials.Battery.ChargeLevel" />
+      <Member Id="P:Xamarin.Essentials.Battery.EnergySaverStatus" />
       <Member Id="P:Xamarin.Essentials.Battery.PowerSource" />
       <Member Id="P:Xamarin.Essentials.Battery.State" />
     </Type>
@@ -185,6 +187,7 @@
       <Member Id="F:Xamarin.Essentials.EnergySaverStatus.Unknown" />
     </Type>
     <Type Name="Xamarin.Essentials.EnergySaverStatusChangedEventArgs" Id="T:Xamarin.Essentials.EnergySaverStatusChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.EnergySaverStatusChangedEventArgs.ToString" />
       <Member Id="P:Xamarin.Essentials.EnergySaverStatusChangedEventArgs.EnergySaverStatus" />
     </Type>
     <Type Name="Xamarin.Essentials.FeatureNotEnabledException" Id="T:Xamarin.Essentials.FeatureNotEnabledException">
@@ -386,10 +389,6 @@
       <Member Id="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapsLaunchOptions)" />
     </Type>
     <Type Name="Xamarin.Essentials.Platform" Id="T:Xamarin.Essentials.Platform" />
-    <Type Name="Xamarin.Essentials.Power" Id="T:Xamarin.Essentials.Power">
-      <Member Id="E:Xamarin.Essentials.Power.EnergySaverStatusChanged" />
-      <Member Id="P:Xamarin.Essentials.Power.EnergySaverStatus" />
-    </Type>
     <Type Name="Xamarin.Essentials.Preferences" Id="T:Xamarin.Essentials.Preferences">
       <Member Id="M:Xamarin.Essentials.Preferences.Clear" />
       <Member Id="M:Xamarin.Essentials.Preferences.Clear(System.String)" />
diff --git a/docs/en/Xamarin.Essentials/Battery.xml b/docs/en/Xamarin.Essentials/Battery.xml
index 404c1521e..ff0c1579f 100644
--- a/docs/en/Xamarin.Essentials/Battery.xml
+++ b/docs/en/Xamarin.Essentials/Battery.xml
@@ -62,6 +62,45 @@
         </remarks>
       </Docs>
     </Member>
+    <Member MemberName="EnergySaverStatus">
+      <MemberSignature Language="C#" Value="public static Xamarin.Essentials.EnergySaverStatus EnergySaverStatus { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property valuetype Xamarin.Essentials.EnergySaverStatus EnergySaverStatus" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.Battery.EnergySaverStatus" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Xamarin.Essentials.EnergySaverStatus</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Gets the current energy saver status of the device.</summary>
+        <value>The current status of energy saver mode.</value>
+        <remarks>
+          <para></para>
+        </remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="EnergySaverStatusChanged">
+      <MemberSignature Language="C#" Value="public static event EventHandler&lt;Xamarin.Essentials.EnergySaverStatusChangedEventArgs&gt; EnergySaverStatusChanged;" />
+      <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class Xamarin.Essentials.EnergySaverStatusChangedEventArgs&gt; EnergySaverStatusChanged" />
+      <MemberSignature Language="DocId" Value="E:Xamarin.Essentials.Battery.EnergySaverStatusChanged" />
+      <MemberType>Event</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.EventHandler&lt;Xamarin.Essentials.EnergySaverStatusChangedEventArgs&gt;</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Event that is triggered when energy saver status changes.</summary>
+        <remarks>
+          <para></para>
+        </remarks>
+      </Docs>
+    </Member>
     <Member MemberName="PowerSource">
       <MemberSignature Language="C#" Value="public static Xamarin.Essentials.BatteryPowerSource PowerSource { get; }" />
       <MemberSignature Language="ILAsm" Value=".property valuetype Xamarin.Essentials.BatteryPowerSource PowerSource" />
diff --git a/docs/en/Xamarin.Essentials/EnergySaverStatusChangedEventArgs.xml b/docs/en/Xamarin.Essentials/EnergySaverStatusChangedEventArgs.xml
index 08b3e468d..2ac6b4b32 100644
--- a/docs/en/Xamarin.Essentials/EnergySaverStatusChangedEventArgs.xml
+++ b/docs/en/Xamarin.Essentials/EnergySaverStatusChangedEventArgs.xml
@@ -33,5 +33,24 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName="ToString">
+      <MemberSignature Language="C#" Value="public override string ToString ();" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance string ToString() cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.EnergySaverStatusChangedEventArgs.ToString" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.String</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
diff --git a/docs/en/Xamarin.Essentials/Power.xml b/docs/en/Xamarin.Essentials/Power.xml
deleted file mode 100644
index 1b742eacf..000000000
--- a/docs/en/Xamarin.Essentials/Power.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<Type Name="Power" FullName="Xamarin.Essentials.Power">
-  <TypeSignature Language="C#" Value="public static class Power" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi abstract sealed beforefieldinit Power extends System.Object" />
-  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.Power" />
-  <AssemblyInfo>
-    <AssemblyName>Xamarin.Essentials</AssemblyName>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <summary>Access to device specific power settings.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
-  </Docs>
-  <Members>
-    <Member MemberName="EnergySaverStatus">
-      <MemberSignature Language="C#" Value="public static Xamarin.Essentials.EnergySaverStatus EnergySaverStatus { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property valuetype Xamarin.Essentials.EnergySaverStatus EnergySaverStatus" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.Power.EnergySaverStatus" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>Xamarin.Essentials.EnergySaverStatus</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>Gets the current energy saver status of the device.</summary>
-        <value>The current status of energy saver mode.</value>
-        <remarks>
-          <para></para>
-        </remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="EnergySaverStatusChanged">
-      <MemberSignature Language="C#" Value="public static event EventHandler&lt;Xamarin.Essentials.EnergySaverStatusChangedEventArgs&gt; EnergySaverStatusChanged;" />
-      <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class Xamarin.Essentials.EnergySaverStatusChangedEventArgs&gt; EnergySaverStatusChanged" />
-      <MemberSignature Language="DocId" Value="E:Xamarin.Essentials.Power.EnergySaverStatusChanged" />
-      <MemberType>Event</MemberType>
-      <AssemblyInfo>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.EventHandler&lt;Xamarin.Essentials.EnergySaverStatusChangedEventArgs&gt;</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>Event that is triggered when energy saver status changes.</summary>
-        <remarks>
-          <para></para>
-        </remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
diff --git a/docs/en/index.xml b/docs/en/index.xml
index a6e85ba2a..e414c1251 100644
--- a/docs/en/index.xml
+++ b/docs/en/index.xml
@@ -150,7 +150,6 @@
       <Type Name="Placemark" Kind="Class" />
       <Type Name="PlacemarkExtensions" Kind="Class" />
       <Type Name="Platform" Kind="Class" />
-      <Type Name="Power" Kind="Class" />
       <Type Name="Preferences" Kind="Class" />
       <Type Name="ScreenLock" Kind="Class" />
       <Type Name="ScreenMetrics" Kind="Structure" />

From 3219cc68a7918d1b1d1cf4383e62f8e69e423ec4 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sat, 3 Nov 2018 01:27:26 +0200
Subject: [PATCH 14/43] Merged the PR

---
 Samples/Samples.Android/Samples.Android.csproj | 16 ++++------------
 Samples/Samples.UWP/Samples.UWP.csproj         | 16 ++++------------
 Samples/Samples.iOS/Samples.iOS.csproj         | 16 ++++------------
 Tests/Tests.csproj                             |  5 +----
 4 files changed, 13 insertions(+), 40 deletions(-)

diff --git a/Samples/Samples.Android/Samples.Android.csproj b/Samples/Samples.Android/Samples.Android.csproj
index fb630c60f..d49296c38 100644
--- a/Samples/Samples.Android/Samples.Android.csproj
+++ b/Samples/Samples.Android/Samples.Android.csproj
@@ -74,18 +74,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AppCenter">
-      <Version>1.10.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.AppCenter.Analytics">
-      <Version>1.10.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.AppCenter.Crashes">
-      <Version>1.10.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.AppCenter.Distribute">
-      <Version>1.10.0</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.AppCenter" Version="1.10.0" />
+    <PackageReference Include="Microsoft.AppCenter.Analytics" Version="1.10.0" />
+    <PackageReference Include="Microsoft.AppCenter.Crashes" Version="1.10.0" />
+    <PackageReference Include="Microsoft.AppCenter.Distribute" Version="1.10.0" />
     <PackageReference Include="Xamarin.Forms" Version="3.3.0.967583" />
     <PackageReference Include="Xamarin.Android.Support.Design" Version="27.0.2.1" />
     <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="27.0.2.1" />
diff --git a/Samples/Samples.UWP/Samples.UWP.csproj b/Samples/Samples.UWP/Samples.UWP.csproj
index 5bda58f75..5e43d9dbd 100644
--- a/Samples/Samples.UWP/Samples.UWP.csproj
+++ b/Samples/Samples.UWP/Samples.UWP.csproj
@@ -126,18 +126,10 @@
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AppCenter">
-      <Version>1.10.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.AppCenter.Analytics">
-      <Version>1.10.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.AppCenter.Crashes">
-      <Version>1.10.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.AppCenter.Distribute">
-      <Version>1.10.0</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.AppCenter" Version="1.10.0" />
+    <PackageReference Include="Microsoft.AppCenter.Analytics" Version="1.10.0" />
+    <PackageReference Include="Microsoft.AppCenter.Crashes" Version="1.10.0" />
+    <PackageReference Include="Microsoft.AppCenter.Distribute" Version="1.10.0" />
     <PackageReference Include="Xamarin.Forms" Version="3.3.0.967583" />
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.5" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
diff --git a/Samples/Samples.iOS/Samples.iOS.csproj b/Samples/Samples.iOS/Samples.iOS.csproj
index 7221ab237..e5164258f 100644
--- a/Samples/Samples.iOS/Samples.iOS.csproj
+++ b/Samples/Samples.iOS/Samples.iOS.csproj
@@ -98,18 +98,10 @@
     <Reference Include="Xamarin.iOS" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AppCenter">
-      <Version>1.10.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.AppCenter.Analytics">
-      <Version>1.10.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.AppCenter.Crashes">
-      <Version>1.10.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.AppCenter.Distribute">
-      <Version>1.10.0</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.AppCenter" Version="1.10.0" />
+    <PackageReference Include="Microsoft.AppCenter.Analytics" Version="1.10.0" />
+    <PackageReference Include="Microsoft.AppCenter.Crashes" Version="1.10.0" />
+    <PackageReference Include="Microsoft.AppCenter.Distribute" Version="1.10.0" />
     <PackageReference Include="Xamarin.Forms" Version="3.3.0.967583" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
   </ItemGroup>
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index d312b16f0..d0d7bae98 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -10,10 +10,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 

From b639765b9b7f7fbd96439a4c3dfb89a3c4720a96 Mon Sep 17 00:00:00 2001
From: Jonathan Dick <jondick@gmail.com>
Date: Fri, 2 Nov 2018 19:28:27 -0400
Subject: [PATCH 15/43] GH-568: [api-fix] Browser (#589)

* OpenAsync returns Task<bool>

Also on iOS we can take advantage of some async methods like PresentViewControllerAsync now.

* Update API docs

* Update Browser.shared.cs
---
 Xamarin.Essentials/Browser/Browser.android.cs |  4 +--
 Xamarin.Essentials/Browser/Browser.ios.cs     | 10 +++---
 .../Browser/Browser.netstandard.cs            |  2 +-
 Xamarin.Essentials/Browser/Browser.shared.cs  |  6 ++--
 Xamarin.Essentials/Browser/Browser.uwp.cs     |  2 +-
 .../xamarin-essentials-android.xml            |  2 +-
 .../xamarin-essentials-ios.xml                |  2 +-
 .../xamarin-essentials-uwp.xml                |  2 +-
 .../en/FrameworksIndex/xamarin-essentials.xml |  2 +-
 docs/en/Xamarin.Essentials/Browser.xml        | 32 +++++++++----------
 .../Xamarin.Essentials/BrowserLaunchMode.xml  | 20 ++++++------
 11 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/Xamarin.Essentials/Browser/Browser.android.cs b/Xamarin.Essentials/Browser/Browser.android.cs
index 5116edeff..baa5c40c3 100644
--- a/Xamarin.Essentials/Browser/Browser.android.cs
+++ b/Xamarin.Essentials/Browser/Browser.android.cs
@@ -10,7 +10,7 @@ namespace Xamarin.Essentials
 {
     public static partial class Browser
     {
-        static Task PlatformOpenAsync(Uri uri, BrowserLaunchMode launchMode)
+        static Task<bool> PlatformOpenAsync(Uri uri, BrowserLaunchMode launchMode)
         {
             var nativeUri = AndroidUri.Parse(uri.AbsoluteUri);
 
@@ -36,7 +36,7 @@ static Task PlatformOpenAsync(Uri uri, BrowserLaunchMode launchMode)
                     break;
             }
 
-            return Task.CompletedTask;
+            return Task.FromResult(true);
         }
     }
 }
diff --git a/Xamarin.Essentials/Browser/Browser.ios.cs b/Xamarin.Essentials/Browser/Browser.ios.cs
index eaa4547d0..a5a2c5f93 100644
--- a/Xamarin.Essentials/Browser/Browser.ios.cs
+++ b/Xamarin.Essentials/Browser/Browser.ios.cs
@@ -2,12 +2,13 @@
 using System.Threading.Tasks;
 using Foundation;
 using SafariServices;
+using UIKit;
 
 namespace Xamarin.Essentials
 {
     public static partial class Browser
     {
-        static Task PlatformOpenAsync(Uri uri, BrowserLaunchMode launchMode)
+        static async Task<bool> PlatformOpenAsync(Uri uri, BrowserLaunchMode launchMode)
         {
             var nativeUrl = new NSUrl(uri.AbsoluteUri);
 
@@ -21,14 +22,13 @@ static Task PlatformOpenAsync(Uri uri, BrowserLaunchMode launchMode)
                     {
                         sfViewController.PopoverPresentationController.SourceView = vc.View;
                     }
-                    vc.PresentViewController(sfViewController, true, null);
+                    await vc.PresentViewControllerAsync(sfViewController, true);
                     break;
                 case BrowserLaunchMode.External:
-                    UIKit.UIApplication.SharedApplication.OpenUrl(nativeUrl);
-                    break;
+                    return await UIApplication.SharedApplication.OpenUrlAsync(nativeUrl, new UIApplicationOpenUrlOptions());
             }
 
-            return Task.CompletedTask;
+            return true;
         }
     }
 }
diff --git a/Xamarin.Essentials/Browser/Browser.netstandard.cs b/Xamarin.Essentials/Browser/Browser.netstandard.cs
index 04b68eded..be881a6ed 100644
--- a/Xamarin.Essentials/Browser/Browser.netstandard.cs
+++ b/Xamarin.Essentials/Browser/Browser.netstandard.cs
@@ -5,7 +5,7 @@ namespace Xamarin.Essentials
 {
     public static partial class Browser
     {
-        static Task PlatformOpenAsync(Uri uri, BrowserLaunchMode launchMode) =>
+        static Task<bool> PlatformOpenAsync(Uri uri, BrowserLaunchMode launchMode) =>
             throw new NotImplementedInReferenceAssemblyException();
     }
 }
diff --git a/Xamarin.Essentials/Browser/Browser.shared.cs b/Xamarin.Essentials/Browser/Browser.shared.cs
index 2f208ffa9..771a12884 100644
--- a/Xamarin.Essentials/Browser/Browser.shared.cs
+++ b/Xamarin.Essentials/Browser/Browser.shared.cs
@@ -21,7 +21,7 @@ public static Task OpenAsync(string uri, BrowserLaunchMode launchMode)
         public static Task OpenAsync(Uri uri) =>
           OpenAsync(uri, BrowserLaunchMode.SystemPreferred);
 
-        public static Task OpenAsync(Uri uri, BrowserLaunchMode launchMode) =>
+        public static Task<bool> OpenAsync(Uri uri, BrowserLaunchMode launchMode) =>
             PlatformOpenAsync(EscapeUri(uri), launchMode);
 
         internal static Uri EscapeUri(Uri uri)
@@ -37,7 +37,7 @@ internal static Uri EscapeUri(Uri uri)
 
     public enum BrowserLaunchMode
     {
-        External,
-        SystemPreferred
+        SystemPreferred = 0,
+        External = 1,
     }
 }
diff --git a/Xamarin.Essentials/Browser/Browser.uwp.cs b/Xamarin.Essentials/Browser/Browser.uwp.cs
index 4ef66ccf0..acafdffa4 100644
--- a/Xamarin.Essentials/Browser/Browser.uwp.cs
+++ b/Xamarin.Essentials/Browser/Browser.uwp.cs
@@ -5,7 +5,7 @@ namespace Xamarin.Essentials
 {
     public static partial class Browser
     {
-        static Task PlatformOpenAsync(Uri uri, BrowserLaunchMode launchType) =>
+        static Task<bool> PlatformOpenAsync(Uri uri, BrowserLaunchMode launchType) =>
              Windows.System.Launcher.LaunchUriAsync(uri).AsTask();
     }
 }
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-android.xml b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
index a92b25a3a..ce5cf54cf 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-android.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
@@ -83,8 +83,8 @@
       <Member Id="M:Xamarin.Essentials.Browser.OpenAsync(System.Uri,Xamarin.Essentials.BrowserLaunchMode)" />
     </Type>
     <Type Name="Xamarin.Essentials.BrowserLaunchMode" Id="T:Xamarin.Essentials.BrowserLaunchMode">
-      <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.External" />
       <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.SystemPreferred" />
+      <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.External" />
     </Type>
     <Type Name="Xamarin.Essentials.Clipboard" Id="T:Xamarin.Essentials.Clipboard">
       <Member Id="M:Xamarin.Essentials.Clipboard.GetTextAsync" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
index 9c7625caf..bfffedb77 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
@@ -83,8 +83,8 @@
       <Member Id="M:Xamarin.Essentials.Browser.OpenAsync(System.Uri,Xamarin.Essentials.BrowserLaunchMode)" />
     </Type>
     <Type Name="Xamarin.Essentials.BrowserLaunchMode" Id="T:Xamarin.Essentials.BrowserLaunchMode">
-      <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.External" />
       <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.SystemPreferred" />
+      <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.External" />
     </Type>
     <Type Name="Xamarin.Essentials.Clipboard" Id="T:Xamarin.Essentials.Clipboard">
       <Member Id="M:Xamarin.Essentials.Clipboard.GetTextAsync" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
index f8b7dcbc3..7e4f49e0f 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
@@ -83,8 +83,8 @@
       <Member Id="M:Xamarin.Essentials.Browser.OpenAsync(System.Uri,Xamarin.Essentials.BrowserLaunchMode)" />
     </Type>
     <Type Name="Xamarin.Essentials.BrowserLaunchMode" Id="T:Xamarin.Essentials.BrowserLaunchMode">
-      <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.External" />
       <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.SystemPreferred" />
+      <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.External" />
     </Type>
     <Type Name="Xamarin.Essentials.Clipboard" Id="T:Xamarin.Essentials.Clipboard">
       <Member Id="M:Xamarin.Essentials.Clipboard.GetTextAsync" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials.xml b/docs/en/FrameworksIndex/xamarin-essentials.xml
index c8e2d4595..fe3868808 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials.xml
@@ -83,8 +83,8 @@
       <Member Id="M:Xamarin.Essentials.Browser.OpenAsync(System.Uri,Xamarin.Essentials.BrowserLaunchMode)" />
     </Type>
     <Type Name="Xamarin.Essentials.BrowserLaunchMode" Id="T:Xamarin.Essentials.BrowserLaunchMode">
-      <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.External" />
       <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.SystemPreferred" />
+      <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.External" />
     </Type>
     <Type Name="Xamarin.Essentials.Clipboard" Id="T:Xamarin.Essentials.Clipboard">
       <Member Id="M:Xamarin.Essentials.Clipboard.GetTextAsync" />
diff --git a/docs/en/Xamarin.Essentials/Browser.xml b/docs/en/Xamarin.Essentials/Browser.xml
index df10fd993..a452b5905 100644
--- a/docs/en/Xamarin.Essentials/Browser.xml
+++ b/docs/en/Xamarin.Essentials/Browser.xml
@@ -16,8 +16,8 @@
   </Docs>
   <Members>
     <Member MemberName="OpenAsync">
-      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenAsync (string uri);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenAsync(string uri) cil managed" />
+      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task&lt;bool&gt; OpenAsync (string uri);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task&lt;bool&gt; OpenAsync(string uri) cil managed" />
       <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Browser.OpenAsync(System.String)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
@@ -25,7 +25,7 @@
         <AssemblyName>Xamarin.Essentials</AssemblyName>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>System.Threading.Tasks.Task</ReturnType>
+        <ReturnType>System.Threading.Tasks.Task&lt;bool&gt;</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="uri" Type="System.String" />
@@ -33,15 +33,15 @@
       <Docs>
         <param name="uri">Uri to launch.</param>
         <summary>Open the browser to specified uri.</summary>
-        <returns>Completed task when browser is launched.</returns>
+        <returns>Completed task when browser is launched, but not necessarily closed.  Result indicates if launching was successful or not.</returns>
         <remarks>
           <para></para>
         </remarks>
       </Docs>
     </Member>
     <Member MemberName="OpenAsync">
-      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenAsync (Uri uri);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenAsync(class System.Uri uri) cil managed" />
+      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task&lt;bool&gt; OpenAsync (Uri uri);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task&lt;bool&gt; OpenAsync(class System.Uri uri) cil managed" />
       <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Browser.OpenAsync(System.Uri)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
@@ -49,7 +49,7 @@
         <AssemblyName>Xamarin.Essentials</AssemblyName>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>System.Threading.Tasks.Task</ReturnType>
+        <ReturnType>System.Threading.Tasks.Task&lt;bool&gt;</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="uri" Type="System.Uri" />
@@ -57,15 +57,15 @@
       <Docs>
         <param name="uri">Uri to launch.</param>
         <summary>Open the browser to specified uri.</summary>
-        <returns>Completed task when browser is launched.</returns>
+        <returns>Completed task when browser is launched, but not necessarily closed.  Result indicates if launching was successful or not.</returns>
         <remarks>
           <para></para>
         </remarks>
       </Docs>
     </Member>
     <Member MemberName="OpenAsync">
-      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenAsync (string uri, Xamarin.Essentials.BrowserLaunchMode launchMode);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenAsync(string uri, valuetype Xamarin.Essentials.BrowserLaunchMode launchMode) cil managed" />
+      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task&lt;bool&gt; OpenAsync (string uri, Xamarin.Essentials.BrowserLaunchMode launchMode);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task&lt;bool&gt; OpenAsync(string uri, valuetype Xamarin.Essentials.BrowserLaunchMode launchMode) cil managed" />
       <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Browser.OpenAsync(System.String,Xamarin.Essentials.BrowserLaunchMode)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
@@ -73,7 +73,7 @@
         <AssemblyName>Xamarin.Essentials</AssemblyName>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>System.Threading.Tasks.Task</ReturnType>
+        <ReturnType>System.Threading.Tasks.Task&lt;bool&gt;</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="uri" Type="System.String" Index="0" />
@@ -83,15 +83,15 @@
         <param name="uri">Uri to launch.</param>
         <param name="launchMode">How to launch the browser.</param>
         <summary>Open the browser to specified uri.</summary>
-        <returns>Completed task when browser is launched.</returns>
+        <returns>Completed task when browser is launched, but not necessarily closed.  Result indicates if launching was successful or not.</returns>
         <remarks>
           <para></para>
         </remarks>
       </Docs>
     </Member>
     <Member MemberName="OpenAsync">
-      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenAsync (Uri uri, Xamarin.Essentials.BrowserLaunchMode launchMode);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenAsync(class System.Uri uri, valuetype Xamarin.Essentials.BrowserLaunchMode launchMode) cil managed" />
+      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task&lt;bool&gt; OpenAsync (Uri uri, Xamarin.Essentials.BrowserLaunchMode launchMode);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task&lt;bool&gt; OpenAsync(class System.Uri uri, valuetype Xamarin.Essentials.BrowserLaunchMode launchMode) cil managed" />
       <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Browser.OpenAsync(System.Uri,Xamarin.Essentials.BrowserLaunchMode)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
@@ -99,7 +99,7 @@
         <AssemblyName>Xamarin.Essentials</AssemblyName>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>System.Threading.Tasks.Task</ReturnType>
+        <ReturnType>System.Threading.Tasks.Task&lt;bool&gt;</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="uri" Type="System.Uri" />
@@ -109,7 +109,7 @@
         <param name="uri">Uri to launch.</param>
         <param name="launchMode">How to launch the browser.</param>
         <summary>Open the browser to specified uri.</summary>
-        <returns>Completed task when browser is launched.</returns>
+        <returns>Completed task when browser is launched, but not necessarily closed.  Result indicates if launching was successful or not.</returns>
         <remarks>
           <para />
         </remarks>
diff --git a/docs/en/Xamarin.Essentials/BrowserLaunchMode.xml b/docs/en/Xamarin.Essentials/BrowserLaunchMode.xml
index ede90445b..0d073f092 100644
--- a/docs/en/Xamarin.Essentials/BrowserLaunchMode.xml
+++ b/docs/en/Xamarin.Essentials/BrowserLaunchMode.xml
@@ -14,10 +14,10 @@
     <remarks>Recommended to use the SystemBrowser as it is the default and falls back to UriLauncher.</remarks>
   </Docs>
   <Members>
-    <Member MemberName="External">
-      <MemberSignature Language="C#" Value="External" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.BrowserLaunchMode External = int32(0)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.BrowserLaunchMode.External" />
+    <Member MemberName="SystemPreferred">
+      <MemberSignature Language="C#" Value="SystemPreferred" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.BrowserLaunchMode SystemPreferred = int32(0)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.BrowserLaunchMode.SystemPreferred" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -28,13 +28,13 @@
       </ReturnValue>
       <MemberValue>0</MemberValue>
       <Docs>
-        <summary>Use the default external launcher to open the browser outside of the app.</summary>
+        <summary>Launch the optimized system browser and stay inside of your application. (Chrome Custom Tabs and SFSafariViewController).</summary>
       </Docs>
     </Member>
-    <Member MemberName="SystemPreferred">
-      <MemberSignature Language="C#" Value="SystemPreferred" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.BrowserLaunchMode SystemPreferred = int32(1)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.BrowserLaunchMode.SystemPreferred" />
+    <Member MemberName="External">
+      <MemberSignature Language="C#" Value="External" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.BrowserLaunchMode External = int32(1)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.BrowserLaunchMode.External" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -45,7 +45,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>Launch the optimized system browser and stay inside of your application. (Chrome Custom Tabs and SFSafariViewController).</summary>
+        <summary>Use the default external launcher to open the browser outside of the app.</summary>
       </Docs>
     </Member>
   </Members>

From f24a7f28f47f83f1d82dd3de8a218b5080615dee Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sat, 3 Nov 2018 01:33:09 +0200
Subject: [PATCH 16/43] re-gen docs

---
 .../xamarin-essentials-android.xml            |  6 +-
 .../xamarin-essentials-ios.xml                |  6 +-
 .../xamarin-essentials-uwp.xml                |  6 +-
 .../en/FrameworksIndex/xamarin-essentials.xml |  7 +-
 docs/en/Xamarin.Essentials/Browser.xml        | 78 +++++++++----------
 .../Xamarin.Essentials/BrowserLaunchMode.xml  | 24 +++---
 docs/en/Xamarin.Essentials/Clipboard.xml      | 13 ++--
 .../GeolocationAccuracy.xml                   | 72 ++++++++---------
 docs/en/index.xml                             |  2 +-
 9 files changed, 103 insertions(+), 111 deletions(-)

diff --git a/docs/en/FrameworksIndex/xamarin-essentials-android.xml b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
index ce5cf54cf..8b022c0f8 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-android.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
@@ -83,8 +83,8 @@
       <Member Id="M:Xamarin.Essentials.Browser.OpenAsync(System.Uri,Xamarin.Essentials.BrowserLaunchMode)" />
     </Type>
     <Type Name="Xamarin.Essentials.BrowserLaunchMode" Id="T:Xamarin.Essentials.BrowserLaunchMode">
-      <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.SystemPreferred" />
       <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.External" />
+      <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.SystemPreferred" />
     </Type>
     <Type Name="Xamarin.Essentials.Clipboard" Id="T:Xamarin.Essentials.Clipboard">
       <Member Id="M:Xamarin.Essentials.Clipboard.GetTextAsync" />
@@ -221,12 +221,12 @@
       <Member Id="M:Xamarin.Essentials.Geolocation.GetLocationAsync(Xamarin.Essentials.GeolocationRequest,System.Threading.CancellationToken)" />
     </Type>
     <Type Name="Xamarin.Essentials.GeolocationAccuracy" Id="T:Xamarin.Essentials.GeolocationAccuracy">
+      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Best" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Default" />
+      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.High" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Low" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Lowest" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Medium" />
-      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.High" />
-      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Best" />
     </Type>
     <Type Name="Xamarin.Essentials.GeolocationRequest" Id="T:Xamarin.Essentials.GeolocationRequest">
       <Member Id="M:Xamarin.Essentials.GeolocationRequest.#ctor" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
index bfffedb77..9e38822a5 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
@@ -83,8 +83,8 @@
       <Member Id="M:Xamarin.Essentials.Browser.OpenAsync(System.Uri,Xamarin.Essentials.BrowserLaunchMode)" />
     </Type>
     <Type Name="Xamarin.Essentials.BrowserLaunchMode" Id="T:Xamarin.Essentials.BrowserLaunchMode">
-      <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.SystemPreferred" />
       <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.External" />
+      <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.SystemPreferred" />
     </Type>
     <Type Name="Xamarin.Essentials.Clipboard" Id="T:Xamarin.Essentials.Clipboard">
       <Member Id="M:Xamarin.Essentials.Clipboard.GetTextAsync" />
@@ -222,12 +222,12 @@
       <Member Id="M:Xamarin.Essentials.Geolocation.GetLocationAsync(Xamarin.Essentials.GeolocationRequest,System.Threading.CancellationToken)" />
     </Type>
     <Type Name="Xamarin.Essentials.GeolocationAccuracy" Id="T:Xamarin.Essentials.GeolocationAccuracy">
+      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Best" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Default" />
+      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.High" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Low" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Lowest" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Medium" />
-      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.High" />
-      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Best" />
     </Type>
     <Type Name="Xamarin.Essentials.GeolocationRequest" Id="T:Xamarin.Essentials.GeolocationRequest">
       <Member Id="M:Xamarin.Essentials.GeolocationRequest.#ctor" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
index 7e4f49e0f..5c04edf94 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
@@ -83,8 +83,8 @@
       <Member Id="M:Xamarin.Essentials.Browser.OpenAsync(System.Uri,Xamarin.Essentials.BrowserLaunchMode)" />
     </Type>
     <Type Name="Xamarin.Essentials.BrowserLaunchMode" Id="T:Xamarin.Essentials.BrowserLaunchMode">
-      <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.SystemPreferred" />
       <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.External" />
+      <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.SystemPreferred" />
     </Type>
     <Type Name="Xamarin.Essentials.Clipboard" Id="T:Xamarin.Essentials.Clipboard">
       <Member Id="M:Xamarin.Essentials.Clipboard.GetTextAsync" />
@@ -221,12 +221,12 @@
       <Member Id="M:Xamarin.Essentials.Geolocation.GetLocationAsync(Xamarin.Essentials.GeolocationRequest,System.Threading.CancellationToken)" />
     </Type>
     <Type Name="Xamarin.Essentials.GeolocationAccuracy" Id="T:Xamarin.Essentials.GeolocationAccuracy">
+      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Best" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Default" />
+      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.High" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Low" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Lowest" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Medium" />
-      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.High" />
-      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Best" />
     </Type>
     <Type Name="Xamarin.Essentials.GeolocationRequest" Id="T:Xamarin.Essentials.GeolocationRequest">
       <Member Id="M:Xamarin.Essentials.GeolocationRequest.#ctor" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials.xml b/docs/en/FrameworksIndex/xamarin-essentials.xml
index fe3868808..5308fa25c 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials.xml
@@ -83,8 +83,8 @@
       <Member Id="M:Xamarin.Essentials.Browser.OpenAsync(System.Uri,Xamarin.Essentials.BrowserLaunchMode)" />
     </Type>
     <Type Name="Xamarin.Essentials.BrowserLaunchMode" Id="T:Xamarin.Essentials.BrowserLaunchMode">
-      <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.SystemPreferred" />
       <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.External" />
+      <Member Id="F:Xamarin.Essentials.BrowserLaunchMode.SystemPreferred" />
     </Type>
     <Type Name="Xamarin.Essentials.Clipboard" Id="T:Xamarin.Essentials.Clipboard">
       <Member Id="M:Xamarin.Essentials.Clipboard.GetTextAsync" />
@@ -221,12 +221,12 @@
       <Member Id="M:Xamarin.Essentials.Geolocation.GetLocationAsync(Xamarin.Essentials.GeolocationRequest,System.Threading.CancellationToken)" />
     </Type>
     <Type Name="Xamarin.Essentials.GeolocationAccuracy" Id="T:Xamarin.Essentials.GeolocationAccuracy">
+      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Best" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Default" />
+      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.High" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Low" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Lowest" />
       <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Medium" />
-      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.High" />
-      <Member Id="F:Xamarin.Essentials.GeolocationAccuracy.Best" />
     </Type>
     <Type Name="Xamarin.Essentials.GeolocationRequest" Id="T:Xamarin.Essentials.GeolocationRequest">
       <Member Id="M:Xamarin.Essentials.GeolocationRequest.#ctor" />
@@ -389,7 +389,6 @@
       <Member Id="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark)" />
       <Member Id="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapsLaunchOptions)" />
     </Type>
-    <Type Name="Xamarin.Essentials.Platform" Id="T:Xamarin.Essentials.Platform" />
     <Type Name="Xamarin.Essentials.Preferences" Id="T:Xamarin.Essentials.Preferences">
       <Member Id="M:Xamarin.Essentials.Preferences.Clear" />
       <Member Id="M:Xamarin.Essentials.Preferences.Clear(System.String)" />
diff --git a/docs/en/Xamarin.Essentials/Browser.xml b/docs/en/Xamarin.Essentials/Browser.xml
index a452b5905..385057b73 100644
--- a/docs/en/Xamarin.Essentials/Browser.xml
+++ b/docs/en/Xamarin.Essentials/Browser.xml
@@ -16,103 +16,95 @@
   </Docs>
   <Members>
     <Member MemberName="OpenAsync">
-      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task&lt;bool&gt; OpenAsync (string uri);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task&lt;bool&gt; OpenAsync(string uri) cil managed" />
+      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenAsync (string uri);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenAsync(string uri) cil managed" />
       <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Browser.OpenAsync(System.String)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>System.Threading.Tasks.Task&lt;bool&gt;</ReturnType>
+        <ReturnType>System.Threading.Tasks.Task</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="uri" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="uri">Uri to launch.</param>
-        <summary>Open the browser to specified uri.</summary>
-        <returns>Completed task when browser is launched, but not necessarily closed.  Result indicates if launching was successful or not.</returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <param name="uri">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
       </Docs>
     </Member>
     <Member MemberName="OpenAsync">
-      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task&lt;bool&gt; OpenAsync (Uri uri);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task&lt;bool&gt; OpenAsync(class System.Uri uri) cil managed" />
+      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenAsync (Uri uri);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenAsync(class System.Uri uri) cil managed" />
       <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Browser.OpenAsync(System.Uri)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>System.Threading.Tasks.Task&lt;bool&gt;</ReturnType>
+        <ReturnType>System.Threading.Tasks.Task</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="uri" Type="System.Uri" />
       </Parameters>
       <Docs>
-        <param name="uri">Uri to launch.</param>
-        <summary>Open the browser to specified uri.</summary>
-        <returns>Completed task when browser is launched, but not necessarily closed.  Result indicates if launching was successful or not.</returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <param name="uri">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
       </Docs>
     </Member>
     <Member MemberName="OpenAsync">
-      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task&lt;bool&gt; OpenAsync (string uri, Xamarin.Essentials.BrowserLaunchMode launchMode);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task&lt;bool&gt; OpenAsync(string uri, valuetype Xamarin.Essentials.BrowserLaunchMode launchMode) cil managed" />
+      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenAsync (string uri, Xamarin.Essentials.BrowserLaunchMode launchMode);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenAsync(string uri, valuetype Xamarin.Essentials.BrowserLaunchMode launchMode) cil managed" />
       <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Browser.OpenAsync(System.String,Xamarin.Essentials.BrowserLaunchMode)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>System.Threading.Tasks.Task&lt;bool&gt;</ReturnType>
+        <ReturnType>System.Threading.Tasks.Task</ReturnType>
       </ReturnValue>
       <Parameters>
-        <Parameter Name="uri" Type="System.String" Index="0" />
-        <Parameter Name="launchMode" Type="Xamarin.Essentials.BrowserLaunchMode" Index="1" />
+        <Parameter Name="uri" Type="System.String" />
+        <Parameter Name="launchMode" Type="Xamarin.Essentials.BrowserLaunchMode" />
       </Parameters>
       <Docs>
-        <param name="uri">Uri to launch.</param>
-        <param name="launchMode">How to launch the browser.</param>
-        <summary>Open the browser to specified uri.</summary>
-        <returns>Completed task when browser is launched, but not necessarily closed.  Result indicates if launching was successful or not.</returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <param name="uri">To be added.</param>
+        <param name="launchMode">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
       </Docs>
     </Member>
     <Member MemberName="OpenAsync">
       <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task&lt;bool&gt; OpenAsync (Uri uri, Xamarin.Essentials.BrowserLaunchMode launchMode);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task&lt;bool&gt; OpenAsync(class System.Uri uri, valuetype Xamarin.Essentials.BrowserLaunchMode launchMode) cil managed" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task`1&lt;bool&gt; OpenAsync(class System.Uri uri, valuetype Xamarin.Essentials.BrowserLaunchMode launchMode) cil managed" />
       <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Browser.OpenAsync(System.Uri,Xamarin.Essentials.BrowserLaunchMode)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>System.Threading.Tasks.Task&lt;bool&gt;</ReturnType>
+        <ReturnType>System.Threading.Tasks.Task&lt;System.Boolean&gt;</ReturnType>
       </ReturnValue>
       <Parameters>
         <Parameter Name="uri" Type="System.Uri" />
         <Parameter Name="launchMode" Type="Xamarin.Essentials.BrowserLaunchMode" />
       </Parameters>
       <Docs>
-        <param name="uri">Uri to launch.</param>
-        <param name="launchMode">How to launch the browser.</param>
-        <summary>Open the browser to specified uri.</summary>
-        <returns>Completed task when browser is launched, but not necessarily closed.  Result indicates if launching was successful or not.</returns>
-        <remarks>
-          <para />
-        </remarks>
+        <param name="uri">To be added.</param>
+        <param name="launchMode">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/Xamarin.Essentials/BrowserLaunchMode.xml b/docs/en/Xamarin.Essentials/BrowserLaunchMode.xml
index 0d073f092..301814870 100644
--- a/docs/en/Xamarin.Essentials/BrowserLaunchMode.xml
+++ b/docs/en/Xamarin.Essentials/BrowserLaunchMode.xml
@@ -14,10 +14,10 @@
     <remarks>Recommended to use the SystemBrowser as it is the default and falls back to UriLauncher.</remarks>
   </Docs>
   <Members>
-    <Member MemberName="SystemPreferred">
-      <MemberSignature Language="C#" Value="SystemPreferred" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.BrowserLaunchMode SystemPreferred = int32(0)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.BrowserLaunchMode.SystemPreferred" />
+    <Member MemberName="External">
+      <MemberSignature Language="C#" Value="External" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.BrowserLaunchMode External = int32(1)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.BrowserLaunchMode.External" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -26,15 +26,15 @@
       <ReturnValue>
         <ReturnType>Xamarin.Essentials.BrowserLaunchMode</ReturnType>
       </ReturnValue>
-      <MemberValue>0</MemberValue>
+      <MemberValue>1</MemberValue>
       <Docs>
-        <summary>Launch the optimized system browser and stay inside of your application. (Chrome Custom Tabs and SFSafariViewController).</summary>
+        <summary>Use the default external launcher to open the browser outside of the app.</summary>
       </Docs>
     </Member>
-    <Member MemberName="External">
-      <MemberSignature Language="C#" Value="External" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.BrowserLaunchMode External = int32(1)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.BrowserLaunchMode.External" />
+    <Member MemberName="SystemPreferred">
+      <MemberSignature Language="C#" Value="SystemPreferred" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.BrowserLaunchMode SystemPreferred = int32(0)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.BrowserLaunchMode.SystemPreferred" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -43,9 +43,9 @@
       <ReturnValue>
         <ReturnType>Xamarin.Essentials.BrowserLaunchMode</ReturnType>
       </ReturnValue>
-      <MemberValue>1</MemberValue>
+      <MemberValue>0</MemberValue>
       <Docs>
-        <summary>Use the default external launcher to open the browser outside of the app.</summary>
+        <summary>Launch the optimized system browser and stay inside of your application. (Chrome Custom Tabs and SFSafariViewController).</summary>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/Xamarin.Essentials/Clipboard.xml b/docs/en/Xamarin.Essentials/Clipboard.xml
index c594f4454..bf5280831 100644
--- a/docs/en/Xamarin.Essentials/Clipboard.xml
+++ b/docs/en/Xamarin.Essentials/Clipboard.xml
@@ -60,14 +60,14 @@
         </remarks>
       </Docs>
     </Member>
-    <Member MemberName="SetText">
+    <Member MemberName="SetTextAsync">
       <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task SetTextAsync (string text);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig System.Threading.Tasks.Task SetTextAsync(string text) cil managed" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task SetTextAsync(string text) cil managed" />
       <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Clipboard.SetTextAsync(System.String)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
         <ReturnType>System.Threading.Tasks.Task</ReturnType>
@@ -76,9 +76,10 @@
         <Parameter Name="text" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="text">The text to put on the clipboard.</param>
-        <summary>Sets the contents of the clipboard to be the specified text.</summary>
-        <remarks>This method returns immediately and does not guarentee that the text is on the clipboard by the time this method returns</remarks>
+        <param name="text">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/Xamarin.Essentials/GeolocationAccuracy.xml b/docs/en/Xamarin.Essentials/GeolocationAccuracy.xml
index 3264a5d0f..8bda73613 100644
--- a/docs/en/Xamarin.Essentials/GeolocationAccuracy.xml
+++ b/docs/en/Xamarin.Essentials/GeolocationAccuracy.xml
@@ -14,10 +14,10 @@
     <remarks></remarks>
   </Docs>
   <Members>
-      <Member MemberName="Default">
-      <MemberSignature Language="C#" Value="Default" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.GeolocationAccuracy Default = int32(0)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.GeolocationAccuracy.Default" />
+    <Member MemberName="Best">
+      <MemberSignature Language="C#" Value="Best" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.GeolocationAccuracy Best = int32(5)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.GeolocationAccuracy.Best" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -26,15 +26,15 @@
       <ReturnValue>
         <ReturnType>Xamarin.Essentials.GeolocationAccuracy</ReturnType>
       </ReturnValue>
-      <MemberValue>0</MemberValue>
+      <MemberValue>5</MemberValue>
       <Docs>
-        <summary>Represents default accuracy (Medium), typically within 30-500 meters.</summary>
+        <summary>Represents the best accuracy, using the most power to obtain and typically within 10 meters.</summary>
       </Docs>
     </Member>
-    <Member MemberName="Low">
-      <MemberSignature Language="C#" Value="Low" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.GeolocationAccuracy Low = int32(1)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.GeolocationAccuracy.Low" />
+    <Member MemberName="Default">
+      <MemberSignature Language="C#" Value="Default" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.GeolocationAccuracy Default = int32(0)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.GeolocationAccuracy.Default" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -43,15 +43,15 @@
       <ReturnValue>
         <ReturnType>Xamarin.Essentials.GeolocationAccuracy</ReturnType>
       </ReturnValue>
-      <MemberValue>1</MemberValue>
+      <MemberValue>0</MemberValue>
       <Docs>
-        <summary>Represents low accuracy, typically within 300-3000 meters.</summary>
+        <summary>Represents default accuracy (Medium), typically within 30-500 meters.</summary>
       </Docs>
     </Member>
-    <Member MemberName="Lowest">
-      <MemberSignature Language="C#" Value="Lowest" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.GeolocationAccuracy Lowest = int32(2)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.GeolocationAccuracy.Lowest" />
+    <Member MemberName="High">
+      <MemberSignature Language="C#" Value="High" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.GeolocationAccuracy High = int32(4)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.GeolocationAccuracy.High" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -60,15 +60,15 @@
       <ReturnValue>
         <ReturnType>Xamarin.Essentials.GeolocationAccuracy</ReturnType>
       </ReturnValue>
-      <MemberValue>2</MemberValue>
+      <MemberValue>4</MemberValue>
       <Docs>
-        <summary>Represents the lowest accuracy, using the least power to obtain and typically within 1000-5000 meters.</summary>
+        <summary>Represents high accuracy, typically within 10-100 meters.</summary>
       </Docs>
     </Member>
-    <Member MemberName="Medium">
-      <MemberSignature Language="C#" Value="Medium" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.GeolocationAccuracy Medium = int32(3)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.GeolocationAccuracy.Medium" />
+    <Member MemberName="Low">
+      <MemberSignature Language="C#" Value="Low" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.GeolocationAccuracy Low = int32(2)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.GeolocationAccuracy.Low" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -77,15 +77,15 @@
       <ReturnValue>
         <ReturnType>Xamarin.Essentials.GeolocationAccuracy</ReturnType>
       </ReturnValue>
-      <MemberValue>3</MemberValue>
+      <MemberValue>2</MemberValue>
       <Docs>
-        <summary>Represents medium accuracy, typically within 30-500 meters.</summary>
+        <summary>Represents low accuracy, typically within 300-3000 meters.</summary>
       </Docs>
     </Member>
-    <Member MemberName="High">
-      <MemberSignature Language="C#" Value="High" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.GeolocationAccuracy High = int32(4)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.GeolocationAccuracy.High" />
+    <Member MemberName="Lowest">
+      <MemberSignature Language="C#" Value="Lowest" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.GeolocationAccuracy Lowest = int32(1)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.GeolocationAccuracy.Lowest" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -94,15 +94,15 @@
       <ReturnValue>
         <ReturnType>Xamarin.Essentials.GeolocationAccuracy</ReturnType>
       </ReturnValue>
-      <MemberValue>4</MemberValue>
+      <MemberValue>1</MemberValue>
       <Docs>
-        <summary>Represents high accuracy, typically within 10-100 meters.</summary>
+        <summary>Represents the lowest accuracy, using the least power to obtain and typically within 1000-5000 meters.</summary>
       </Docs>
     </Member>
-    <Member MemberName="Best">
-      <MemberSignature Language="C#" Value="Best" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.GeolocationAccuracy Best = int32(5)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.GeolocationAccuracy.Best" />
+    <Member MemberName="Medium">
+      <MemberSignature Language="C#" Value="Medium" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.GeolocationAccuracy Medium = int32(3)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.GeolocationAccuracy.Medium" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -111,9 +111,9 @@
       <ReturnValue>
         <ReturnType>Xamarin.Essentials.GeolocationAccuracy</ReturnType>
       </ReturnValue>
-      <MemberValue>5</MemberValue>
+      <MemberValue>3</MemberValue>
       <Docs>
-        <summary>Represents the best accuracy, using the most power to obtain and typically within 10 meters.</summary>
+        <summary>Represents medium accuracy, typically within 30-500 meters.</summary>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/index.xml b/docs/en/index.xml
index e414c1251..59471ddc9 100644
--- a/docs/en/index.xml
+++ b/docs/en/index.xml
@@ -78,7 +78,7 @@
           <AttributeName>System.Runtime.Versioning.TargetFramework(".NETCore,Version=v5.0", FrameworkDisplayName=".NET for Windows Universal")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyInformationalVersion("1.0.0+2fe4bedaf457fd79b590e4b34d21e5fdb6de1b33")</AttributeName>
+          <AttributeName>System.Reflection.AssemblyInformationalVersion("1.0.0+b639765b9b7f7fbd96439a4c3dfb89a3c4720a96")</AttributeName>
         </Attribute>
       </Attributes>
     </Assembly>

From 6f5b46f4c18e12ed242a4db7e90d69c4022d92a6 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sat, 3 Nov 2018 01:46:14 +0200
Subject: [PATCH 17/43] Generated docs

---
 docs/en/Xamarin.Essentials/Accelerometer.xml  |  8 +--
 .../Xamarin.Essentials/AccelerometerData.xml  |  4 +-
 docs/en/Xamarin.Essentials/Barometer.xml      | 16 ++---
 .../BarometerChangedEventArgs.xml             | 12 +---
 docs/en/Xamarin.Essentials/BarometerData.xml  | 20 ++----
 docs/en/Xamarin.Essentials/Battery.xml        | 25 ++------
 .../BatteryChangedEventArgs.xml               | 12 +---
 .../Xamarin.Essentials/BatteryPowerSource.xml |  4 +-
 docs/en/Xamarin.Essentials/BatteryState.xml   |  4 +-
 docs/en/Xamarin.Essentials/Browser.xml        | 36 +++++------
 docs/en/Xamarin.Essentials/Clipboard.xml      | 12 ++--
 docs/en/Xamarin.Essentials/Compass.xml        | 16 ++---
 docs/en/Xamarin.Essentials/CompassData.xml    |  4 +-
 .../Xamarin.Essentials/ConnectionProfile.xml  |  4 +-
 docs/en/Xamarin.Essentials/Connectivity.xml   |  5 +-
 .../ConnectivityChangedEventArgs.xml          |  4 +-
 .../Xamarin.Essentials/DeviceInfo+Idioms.xml  |  4 +-
 docs/en/Xamarin.Essentials/DeviceInfo.xml     |  4 +-
 docs/en/Xamarin.Essentials/DeviceType.xml     |  4 +-
 docs/en/Xamarin.Essentials/FileSystem.xml     |  8 +--
 docs/en/Xamarin.Essentials/Geocoding.xml      | 16 ++---
 docs/en/Xamarin.Essentials/Gyroscope.xml      | 12 +---
 .../GyroscopeChangedEventArgs.xml             |  4 +-
 docs/en/Xamarin.Essentials/GyroscopeData.xml  |  4 +-
 docs/en/Xamarin.Essentials/Location.xml       | 64 +++++--------------
 .../Xamarin.Essentials/LocationExtensions.xml | 12 +---
 docs/en/Xamarin.Essentials/Magnetometer.xml   |  8 +--
 .../MagnetometerChangedEventArgs.xml          |  8 +--
 .../Xamarin.Essentials/MagnetometerData.xml   |  4 +-
 docs/en/Xamarin.Essentials/MainThread.xml     |  4 +-
 docs/en/Xamarin.Essentials/Maps.xml           | 22 ++-----
 .../Xamarin.Essentials/MapsLaunchOptions.xml  |  4 +-
 .../Xamarin.Essentials/OrientationSensor.xml  | 20 ++----
 .../OrientationSensorChangedEventArgs.xml     |  4 +-
 docs/en/Xamarin.Essentials/PhoneDialer.xml    |  6 +-
 docs/en/Xamarin.Essentials/Placemark.xml      | 56 ++++------------
 docs/en/Xamarin.Essentials/Platform.xml       |  8 +--
 docs/en/Xamarin.Essentials/ScreenMetrics.xml  | 16 ++---
 docs/en/Xamarin.Essentials/SecureStorage.xml  | 20 ++----
 docs/en/Xamarin.Essentials/SensorSpeed.xml    |  4 +-
 docs/en/Xamarin.Essentials/Share.xml          |  4 +-
 .../Xamarin.Essentials/ShareTextRequest.xml   |  4 +-
 docs/en/index.xml                             |  2 +-
 43 files changed, 140 insertions(+), 372 deletions(-)

diff --git a/docs/en/Xamarin.Essentials/Accelerometer.xml b/docs/en/Xamarin.Essentials/Accelerometer.xml
index 48949cfb3..5ef1eaac7 100644
--- a/docs/en/Xamarin.Essentials/Accelerometer.xml
+++ b/docs/en/Xamarin.Essentials/Accelerometer.xml
@@ -14,9 +14,7 @@
     <summary>
       <para>Accelerometer data of the acceleration of the device in three dimensional space.</para>
     </summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="IsMonitoring">
@@ -34,9 +32,7 @@
       <Docs>
         <summary>Gets if acceleromter is being monitored.</summary>
         <value>If monitoring.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="ReadingChanged">
diff --git a/docs/en/Xamarin.Essentials/AccelerometerData.xml b/docs/en/Xamarin.Essentials/AccelerometerData.xml
index 7ccf5b1ab..55cf2de65 100644
--- a/docs/en/Xamarin.Essentials/AccelerometerData.xml
+++ b/docs/en/Xamarin.Essentials/AccelerometerData.xml
@@ -21,9 +21,7 @@
   </Attributes>
   <Docs>
     <summary>Data representing the devies' three accelerometers.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="Acceleration">
diff --git a/docs/en/Xamarin.Essentials/Barometer.xml b/docs/en/Xamarin.Essentials/Barometer.xml
index 434a7fed6..968231480 100644
--- a/docs/en/Xamarin.Essentials/Barometer.xml
+++ b/docs/en/Xamarin.Essentials/Barometer.xml
@@ -12,9 +12,7 @@
   <Interfaces />
   <Docs>
     <summary>Monitor changes to the atmospheric pressure.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="IsMonitoring">
@@ -32,9 +30,7 @@
       <Docs>
         <summary>Gets if barometer is actively being monitored.</summary>
         <value>If barometer is being monitored.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="ReadingChanged">
@@ -51,9 +47,7 @@
       </ReturnValue>
       <Docs>
         <summary>Event triggered when barometer reading changes.</summary>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Start">
@@ -92,9 +86,7 @@
       <Parameters />
       <Docs>
         <summary>Stop monitoring for changes to the barometer.</summary>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/Xamarin.Essentials/BarometerChangedEventArgs.xml b/docs/en/Xamarin.Essentials/BarometerChangedEventArgs.xml
index 21ac63d12..57e080765 100644
--- a/docs/en/Xamarin.Essentials/BarometerChangedEventArgs.xml
+++ b/docs/en/Xamarin.Essentials/BarometerChangedEventArgs.xml
@@ -12,9 +12,7 @@
   <Interfaces />
   <Docs>
     <summary>The current pressure information from the change event.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="BarometerData">
@@ -32,9 +30,7 @@
       <Docs>
         <summary>Gets the current barometer pressure data</summary>
         <value>Pressure in hPA</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Reading">
@@ -52,9 +48,7 @@
       <Docs>
         <summary>Get the current reading of the barometer</summary>
         <value>The reading</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/Xamarin.Essentials/BarometerData.xml b/docs/en/Xamarin.Essentials/BarometerData.xml
index 688055145..c874d2296 100644
--- a/docs/en/Xamarin.Essentials/BarometerData.xml
+++ b/docs/en/Xamarin.Essentials/BarometerData.xml
@@ -23,9 +23,7 @@
     <summary>
       <para>Contains the pressure measured by the user's device.</para>
     </summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="Equals">
@@ -74,9 +72,7 @@
         <param name="other">Other object to compare</param>
         <summary>If equal to another object</summary>
         <returns>If equal</returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="GetHashCode">
@@ -95,9 +91,7 @@
       <Docs>
         <summary>Get has code for object.</summary>
         <returns>The hash code.</returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="op_Equality">
@@ -147,9 +141,7 @@
         <param name="right">Right to comapre</param>
         <summary>If not equal to another object</summary>
         <returns>If not equal</returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Pressure">
@@ -167,9 +159,7 @@
       <Docs>
         <summary>Pressure in hPA</summary>
         <value>The pressure</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="ToString">
diff --git a/docs/en/Xamarin.Essentials/Battery.xml b/docs/en/Xamarin.Essentials/Battery.xml
index ff0c1579f..f93b34f1a 100644
--- a/docs/en/Xamarin.Essentials/Battery.xml
+++ b/docs/en/Xamarin.Essentials/Battery.xml
@@ -17,7 +17,6 @@
       <para>- Android: Battery_Stats permission must be set in manifest.</para>
       <para>- iOS: Simulator will not return battery information, must be run on device</para>
       <para>- UWP: None</para>
-      <para></para>
     </remarks>
   </Docs>
   <Members>
@@ -35,9 +34,7 @@
       </ReturnValue>
       <Docs>
         <summary>Event trigger when battery properties have changed.</summary>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="ChargeLevel">
@@ -57,9 +54,7 @@
         <value>
           <para>Level of charge.</para>
         </value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="EnergySaverStatus">
@@ -77,9 +72,7 @@
       <Docs>
         <summary>Gets the current energy saver status of the device.</summary>
         <value>The current status of energy saver mode.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="EnergySaverStatusChanged">
@@ -96,9 +89,7 @@
       </ReturnValue>
       <Docs>
         <summary>Event that is triggered when energy saver status changes.</summary>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="PowerSource">
@@ -118,9 +109,7 @@
         <value>
           <para>Power source, or uknown.</para>
         </value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="State">
@@ -138,9 +127,7 @@
       <Docs>
         <summary>Gets the charging state of the device if it can be determined.</summary>
         <value>Battery state, or unknown.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/Xamarin.Essentials/BatteryChangedEventArgs.xml b/docs/en/Xamarin.Essentials/BatteryChangedEventArgs.xml
index 3daa85de1..4da1c42d3 100644
--- a/docs/en/Xamarin.Essentials/BatteryChangedEventArgs.xml
+++ b/docs/en/Xamarin.Essentials/BatteryChangedEventArgs.xml
@@ -30,9 +30,7 @@
       <Docs>
         <summary>Gets the current charge level of the device from 0.0 to 1.0.</summary>
         <value>Level of charge.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="PowerSource">
@@ -50,9 +48,7 @@
       <Docs>
         <summary>Gets the current power source for the device.</summary>
         <value>Power source, or unknown</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="State">
@@ -70,9 +66,7 @@
       <Docs>
         <summary>Gets the charging state of the device if it can be determined.</summary>
         <value>Battery state, or unknown.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="ToString">
diff --git a/docs/en/Xamarin.Essentials/BatteryPowerSource.xml b/docs/en/Xamarin.Essentials/BatteryPowerSource.xml
index cdfd85696..baf00644d 100644
--- a/docs/en/Xamarin.Essentials/BatteryPowerSource.xml
+++ b/docs/en/Xamarin.Essentials/BatteryPowerSource.xml
@@ -11,9 +11,7 @@
   </Base>
   <Docs>
     <summary>How the device and battery are currently being powered or charged.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="AC">
diff --git a/docs/en/Xamarin.Essentials/BatteryState.xml b/docs/en/Xamarin.Essentials/BatteryState.xml
index e4a568d49..d2b619fd9 100644
--- a/docs/en/Xamarin.Essentials/BatteryState.xml
+++ b/docs/en/Xamarin.Essentials/BatteryState.xml
@@ -11,9 +11,7 @@
   </Base>
   <Docs>
     <summary>The current state of the battery and if it is being charged or full.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="Charging">
diff --git a/docs/en/Xamarin.Essentials/Browser.xml b/docs/en/Xamarin.Essentials/Browser.xml
index 385057b73..b07b13b90 100644
--- a/docs/en/Xamarin.Essentials/Browser.xml
+++ b/docs/en/Xamarin.Essentials/Browser.xml
@@ -31,10 +31,10 @@
         <Parameter Name="uri" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="uri">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <param name="uri">Uri to launch.</param>
+        <summary>Open the browser to specified uri.</summary>
+        <returns>Completed task when browser is launched, but not necessarily closed.  Result indicates if launching was successful or not.</returns>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="OpenAsync">
@@ -53,10 +53,10 @@
         <Parameter Name="uri" Type="System.Uri" />
       </Parameters>
       <Docs>
-        <param name="uri">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <param name="uri">Uri to launch.</param>
+        <summary>Open the browser to specified uri.</summary>
+        <returns>Completed task when browser is launched, but not necessarily closed.  Result indicates if launching was successful or not.</returns>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="OpenAsync">
@@ -76,11 +76,11 @@
         <Parameter Name="launchMode" Type="Xamarin.Essentials.BrowserLaunchMode" />
       </Parameters>
       <Docs>
-        <param name="uri">To be added.</param>
-        <param name="launchMode">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <param name="uri">Uri to launch.</param>
+        <param name="launchMode">How to launch the browser.</param>
+        <summary>Open the browser to specified uri.</summary>
+        <returns>Completed task when browser is launched, but not necessarily closed.  Result indicates if launching was successful or not.</returns>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="OpenAsync">
@@ -100,11 +100,11 @@
         <Parameter Name="launchMode" Type="Xamarin.Essentials.BrowserLaunchMode" />
       </Parameters>
       <Docs>
-        <param name="uri">To be added.</param>
-        <param name="launchMode">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <param name="uri">Uri to launch.</param>
+        <param name="launchMode">How to launch the browser.</param>
+        <summary>Open the browser to specified uri.</summary>
+        <returns>Completed task when browser is launched, but not necessarily closed.  Result indicates if launching was successful or not.</returns>
+        <remarks></remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/Xamarin.Essentials/Clipboard.xml b/docs/en/Xamarin.Essentials/Clipboard.xml
index bf5280831..5ae388daf 100644
--- a/docs/en/Xamarin.Essentials/Clipboard.xml
+++ b/docs/en/Xamarin.Essentials/Clipboard.xml
@@ -12,9 +12,7 @@
   <Interfaces />
   <Docs>
     <summary>Provides a way to work with text on the device clipboard.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="GetTextAsync">
@@ -76,10 +74,10 @@
         <Parameter Name="text" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="text">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <param name="text">The text to put on the clipboard.</param>
+        <summary>Sets the contents of the clipboard to be the specified text.</summary>
+        <returns>Returns text that is on the clipboard, or null if there is none.</returns>
+        <remarks>This method returns immediately and does not guarentee that the text is on the clipboard by the time this method returns</remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/Xamarin.Essentials/Compass.xml b/docs/en/Xamarin.Essentials/Compass.xml
index 8cf049a52..bf56da15a 100644
--- a/docs/en/Xamarin.Essentials/Compass.xml
+++ b/docs/en/Xamarin.Essentials/Compass.xml
@@ -12,9 +12,7 @@
   <Interfaces />
   <Docs>
     <summary>Monitor changes to the orientation of the user's device.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="ApplyLowPassFilter">
@@ -32,9 +30,7 @@
       <Docs>
         <summary>Applies a moving average filter on the Android implementation. Unused on other platforms</summary>
         <value>If a low pass filter is applied</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="IsMonitoring">
@@ -52,9 +48,7 @@
       <Docs>
         <summary>Gets if compass is actively being monitored.</summary>
         <value>If compass is being monitored.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="ReadingChanged">
@@ -130,9 +124,7 @@
       <Parameters />
       <Docs>
         <summary>Stop monitoring for changes to the compass.</summary>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/Xamarin.Essentials/CompassData.xml b/docs/en/Xamarin.Essentials/CompassData.xml
index 015b42869..3c52ba371 100644
--- a/docs/en/Xamarin.Essentials/CompassData.xml
+++ b/docs/en/Xamarin.Essentials/CompassData.xml
@@ -23,9 +23,7 @@
     <summary>
       <para>Contains the orientation of the user's device.</para>
     </summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="Equals">
diff --git a/docs/en/Xamarin.Essentials/ConnectionProfile.xml b/docs/en/Xamarin.Essentials/ConnectionProfile.xml
index 4e72eaab2..f9ca29a6a 100644
--- a/docs/en/Xamarin.Essentials/ConnectionProfile.xml
+++ b/docs/en/Xamarin.Essentials/ConnectionProfile.xml
@@ -11,9 +11,7 @@
   </Base>
   <Docs>
     <summary>Describes the type of connection the device is using.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="Bluetooth">
diff --git a/docs/en/Xamarin.Essentials/Connectivity.xml b/docs/en/Xamarin.Essentials/Connectivity.xml
index 2033b90ab..6e267c0fe 100644
--- a/docs/en/Xamarin.Essentials/Connectivity.xml
+++ b/docs/en/Xamarin.Essentials/Connectivity.xml
@@ -12,9 +12,7 @@
   <Interfaces />
   <Docs>
     <summary>Connectivity and networking helpers.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="ConnectionProfiles">
@@ -55,7 +53,6 @@
         </summary>
         <remarks>
           <para>Can throw PermissionException on Android if ACCESS_NETWORK_STATE is not set in manifest.</para>
-          <para></para>
         </remarks>
       </Docs>
     </Member>
diff --git a/docs/en/Xamarin.Essentials/ConnectivityChangedEventArgs.xml b/docs/en/Xamarin.Essentials/ConnectivityChangedEventArgs.xml
index 078412ec0..939eb7224 100644
--- a/docs/en/Xamarin.Essentials/ConnectivityChangedEventArgs.xml
+++ b/docs/en/Xamarin.Essentials/ConnectivityChangedEventArgs.xml
@@ -52,9 +52,7 @@
       <Docs>
         <summary>Gets the current state of network access. Does not guarantee full access to the internet.</summary>
         <value>The current network access state.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="ToString">
diff --git a/docs/en/Xamarin.Essentials/DeviceInfo+Idioms.xml b/docs/en/Xamarin.Essentials/DeviceInfo+Idioms.xml
index 40462a611..68f05f9bf 100644
--- a/docs/en/Xamarin.Essentials/DeviceInfo+Idioms.xml
+++ b/docs/en/Xamarin.Essentials/DeviceInfo+Idioms.xml
@@ -12,9 +12,7 @@
   <Interfaces />
   <Docs>
     <summary>The device idiom.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="Desktop">
diff --git a/docs/en/Xamarin.Essentials/DeviceInfo.xml b/docs/en/Xamarin.Essentials/DeviceInfo.xml
index 4163a7cf9..53b855b84 100644
--- a/docs/en/Xamarin.Essentials/DeviceInfo.xml
+++ b/docs/en/Xamarin.Essentials/DeviceInfo.xml
@@ -172,9 +172,7 @@
       <Docs>
         <summary>Gets the version of the operating system.</summary>
         <value>The version of the operating system.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/Xamarin.Essentials/DeviceType.xml b/docs/en/Xamarin.Essentials/DeviceType.xml
index aaf8d0dd2..7f509b862 100644
--- a/docs/en/Xamarin.Essentials/DeviceType.xml
+++ b/docs/en/Xamarin.Essentials/DeviceType.xml
@@ -11,9 +11,7 @@
   </Base>
   <Docs>
     <summary>Various types of devices.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="Physical">
diff --git a/docs/en/Xamarin.Essentials/FileSystem.xml b/docs/en/Xamarin.Essentials/FileSystem.xml
index 36ce375d9..44ffac9b4 100644
--- a/docs/en/Xamarin.Essentials/FileSystem.xml
+++ b/docs/en/Xamarin.Essentials/FileSystem.xml
@@ -12,9 +12,7 @@
   <Interfaces />
   <Docs>
     <summary>Provides an easy way to access the locations for device folders.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="AppDataDirectory">
@@ -72,9 +70,7 @@
         <param name="filename">the name of the file to load from the app package.</param>
         <summary>Opens a stream to a file contained withing the app package.</summary>
         <returns>Returns a stream to the file.</returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/Xamarin.Essentials/Geocoding.xml b/docs/en/Xamarin.Essentials/Geocoding.xml
index 1b0e906e4..4fd2f8d30 100644
--- a/docs/en/Xamarin.Essentials/Geocoding.xml
+++ b/docs/en/Xamarin.Essentials/Geocoding.xml
@@ -12,9 +12,7 @@
   <Interfaces />
   <Docs>
     <summary>Easily convert between geographic coordinated and place names.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="GetLocationsAsync">
@@ -38,9 +36,7 @@
         <returns>
           <para>List of locations that best match the address or null if none found.</para>
         </returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="GetPlacemarksAsync">
@@ -62,9 +58,7 @@
         <param name="location">Location to find placemarks for.</param>
         <summary>Retrieve placemarks for a given location.</summary>
         <returns>List of placemarks or null if no placemarks are found.</returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="GetPlacemarksAsync">
@@ -88,9 +82,7 @@
         <param name="longitude">Longitude of the location.</param>
         <summary>Retrieve location for a given address.</summary>
         <returns>List of placemarks or null if no placemarks are found.</returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/Xamarin.Essentials/Gyroscope.xml b/docs/en/Xamarin.Essentials/Gyroscope.xml
index 3823ed938..7f4a836b3 100644
--- a/docs/en/Xamarin.Essentials/Gyroscope.xml
+++ b/docs/en/Xamarin.Essentials/Gyroscope.xml
@@ -12,9 +12,7 @@
   <Interfaces />
   <Docs>
     <summary>Gyroscope data of the rotation around the device's three primary axis.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="IsMonitoring">
@@ -32,9 +30,7 @@
       <Docs>
         <summary>Gets if gyro is being monitored.</summary>
         <value>If monitoring.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="ReadingChanged">
@@ -51,9 +47,7 @@
       </ReturnValue>
       <Docs>
         <summary>Event triggered when reading of sensor changes.</summary>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Start">
diff --git a/docs/en/Xamarin.Essentials/GyroscopeChangedEventArgs.xml b/docs/en/Xamarin.Essentials/GyroscopeChangedEventArgs.xml
index 2d575a86a..4ce7259f5 100644
--- a/docs/en/Xamarin.Essentials/GyroscopeChangedEventArgs.xml
+++ b/docs/en/Xamarin.Essentials/GyroscopeChangedEventArgs.xml
@@ -12,9 +12,7 @@
   <Interfaces />
   <Docs>
     <summary>Event arguments containing the current reading.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="Reading">
diff --git a/docs/en/Xamarin.Essentials/GyroscopeData.xml b/docs/en/Xamarin.Essentials/GyroscopeData.xml
index 973870075..34c9bd208 100644
--- a/docs/en/Xamarin.Essentials/GyroscopeData.xml
+++ b/docs/en/Xamarin.Essentials/GyroscopeData.xml
@@ -21,9 +21,7 @@
   </Attributes>
   <Docs>
     <summary>Gyroscope information.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="AngularVelocity">
diff --git a/docs/en/Xamarin.Essentials/Location.xml b/docs/en/Xamarin.Essentials/Location.xml
index f5df9f533..c2b6232f7 100644
--- a/docs/en/Xamarin.Essentials/Location.xml
+++ b/docs/en/Xamarin.Essentials/Location.xml
@@ -12,9 +12,7 @@
   <Interfaces />
   <Docs>
     <summary>The latitude, longitude, and time information reported by the device.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName=".ctor">
@@ -29,9 +27,7 @@
       <Parameters />
       <Docs>
         <summary>Constructor for a location.</summary>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -49,9 +45,7 @@
       <Docs>
         <param name="point">Location to copy values from.</param>
         <summary>Constructor for a location.</summary>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -71,9 +65,7 @@
         <param name="latitude">Default latitude for location.</param>
         <param name="longitude">Default longitude for location.</param>
         <summary>Constructor for a location.</summary>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -95,9 +87,7 @@
         <param name="longitude">Default longitude for location.</param>
         <param name="timestamp">Timestamp for the location (Utc based).</param>
         <summary>Constructor for a location.</summary>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Accuracy">
@@ -115,9 +105,7 @@
       <Docs>
         <summary>Gets or sets the accuracy (in meters) of the location.</summary>
         <value>The location accuracy.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Altitude">
@@ -161,9 +149,7 @@
         <param name="units">Units to return.</param>
         <summary>Calculate distance between two locations.</summary>
         <returns>Distance between two locations in the unit selected.</returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="CalculateDistance">
@@ -191,9 +177,7 @@
         <param name="units">Unit to return.</param>
         <summary>Calculate distance between two locations.</summary>
         <returns>Distance calculated.</returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="CalculateDistance">
@@ -221,9 +205,7 @@
         <param name="units">Unit to use.</param>
         <summary>Calculate distance between two locations.</summary>
         <returns>Distance calculated.</returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="CalculateDistance">
@@ -253,9 +235,7 @@
         <param name="units">Units to return.</param>
         <summary>Calculate distance between two locations.</summary>
         <returns>Distance between two locations in the unit selected.</returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Course">
@@ -299,9 +279,7 @@
         </param>
         <summary>Convert kilometers to miles.</summary>
         <returns>Miles conversion from kilometers.</returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Latitude">
@@ -319,9 +297,7 @@
       <Docs>
         <summary>Gets or sets the latitude of location.</summary>
         <value>Latitude of the location.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Longitude">
@@ -339,9 +315,7 @@
       <Docs>
         <summary>Gets or sets the longitude of location.</summary>
         <value>Longitude of the location.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="MilesToKilometers">
@@ -363,9 +337,7 @@
         <param name="miles">Miles to be converted.</param>
         <summary>Converts miles to kilometers.</summary>
         <returns>Value of miles converted to kilometers.</returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Speed">
@@ -383,9 +355,7 @@
       <Docs>
         <summary>Speed in meters per second.</summary>
         <value>Speed measured by the device..</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Timestamp">
@@ -403,9 +373,7 @@
       <Docs>
         <summary>Gets or sets the timestamp of the location.</summary>
         <value>UTC timestamp.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="ToString">
diff --git a/docs/en/Xamarin.Essentials/LocationExtensions.xml b/docs/en/Xamarin.Essentials/LocationExtensions.xml
index d4075a93b..0bfdd14bc 100644
--- a/docs/en/Xamarin.Essentials/LocationExtensions.xml
+++ b/docs/en/Xamarin.Essentials/LocationExtensions.xml
@@ -12,9 +12,7 @@
   <Interfaces />
   <Docs>
     <summary>Location Extensions</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="CalculateDistance">
@@ -40,9 +38,7 @@
         <param name="units">Units to use during calculation.</param>
         <summary>Extension to calculate distance from location to another location.</summary>
         <returns>Distance in units fro two locations.</returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="CalculateDistance">
@@ -70,9 +66,7 @@
         <param name="units">Units to use.</param>
         <summary>Extension to calculate distance from location to another location.</summary>
         <returns>Distance calculated.</returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="OpenMapsAsync">
diff --git a/docs/en/Xamarin.Essentials/Magnetometer.xml b/docs/en/Xamarin.Essentials/Magnetometer.xml
index c12210ff6..6a277f474 100644
--- a/docs/en/Xamarin.Essentials/Magnetometer.xml
+++ b/docs/en/Xamarin.Essentials/Magnetometer.xml
@@ -12,9 +12,7 @@
   <Interfaces />
   <Docs>
     <summary>Detect device's orentation relative to Earth's magnetic field.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="IsMonitoring">
@@ -90,9 +88,7 @@
       <Parameters />
       <Docs>
         <summary>Stop monitoring for changes to magnetometer.</summary>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/Xamarin.Essentials/MagnetometerChangedEventArgs.xml b/docs/en/Xamarin.Essentials/MagnetometerChangedEventArgs.xml
index 72becd2d3..194837ef9 100644
--- a/docs/en/Xamarin.Essentials/MagnetometerChangedEventArgs.xml
+++ b/docs/en/Xamarin.Essentials/MagnetometerChangedEventArgs.xml
@@ -12,9 +12,7 @@
   <Interfaces />
   <Docs>
     <summary>Event arguments containing the current reading.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="Reading">
@@ -32,9 +30,7 @@
       <Docs>
         <summary>Gets the reading of the magnetometer.</summary>
         <value>The reading.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/Xamarin.Essentials/MagnetometerData.xml b/docs/en/Xamarin.Essentials/MagnetometerData.xml
index 53e9d44a9..d214df114 100644
--- a/docs/en/Xamarin.Essentials/MagnetometerData.xml
+++ b/docs/en/Xamarin.Essentials/MagnetometerData.xml
@@ -21,9 +21,7 @@
   </Attributes>
   <Docs>
     <summary>Data for magnetometer changes.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="Equals">
diff --git a/docs/en/Xamarin.Essentials/MainThread.xml b/docs/en/Xamarin.Essentials/MainThread.xml
index c383d456a..259cb3519 100644
--- a/docs/en/Xamarin.Essentials/MainThread.xml
+++ b/docs/en/Xamarin.Essentials/MainThread.xml
@@ -33,9 +33,7 @@
       <Docs>
         <param name="action">Action to execute.</param>
         <summary>Invokes an action on the main thread of the application.</summary>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="IsMainThread">
diff --git a/docs/en/Xamarin.Essentials/Maps.xml b/docs/en/Xamarin.Essentials/Maps.xml
index 59f6eeb03..be600c78c 100644
--- a/docs/en/Xamarin.Essentials/Maps.xml
+++ b/docs/en/Xamarin.Essentials/Maps.xml
@@ -12,9 +12,7 @@
   <Interfaces />
   <Docs>
     <summary>Map helpers to open a route to specified places via default platforms maps implementation.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="OpenAsync">
@@ -36,9 +34,7 @@
         <param name="location">Location to open on maps.</param>
         <summary>Open the installed application to a specific location.</summary>
         <returns>Task to be completed.</returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="OpenAsync">
@@ -60,7 +56,7 @@
         <param name="placemark">Placemark to open on maps.</param>
         <summary>Open the installed application to a specific placemark.</summary>
         <returns>Task to be completed.</returns>
-        <remarks>To be added.</remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="OpenAsync">
@@ -84,9 +80,7 @@
         <param name="longitude">Longitude to open to.</param>
         <summary>Open the installed application to a specific location.</summary>
         <returns>Task to be completed.</returns>
-        <remarks>
-          <para />
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="OpenAsync">
@@ -110,9 +104,7 @@
         <param name="options">Launch options to use.</param>
         <summary>Open the installed application to a specific location with launch options.</summary>
         <returns>Task to be completed.</returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="OpenAsync">
@@ -136,9 +128,7 @@
         <param name="options">Launch options to use.</param>
         <summary>Open the installed application to a specific placemark with launch options..</summary>
         <returns>Task to be completed.</returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="OpenAsync">
diff --git a/docs/en/Xamarin.Essentials/MapsLaunchOptions.xml b/docs/en/Xamarin.Essentials/MapsLaunchOptions.xml
index 4c3b49ee3..f0959c61a 100644
--- a/docs/en/Xamarin.Essentials/MapsLaunchOptions.xml
+++ b/docs/en/Xamarin.Essentials/MapsLaunchOptions.xml
@@ -65,9 +65,7 @@
       <Docs>
         <summary>Name of destination to display to user.</summary>
         <value>Gets the name.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/Xamarin.Essentials/OrientationSensor.xml b/docs/en/Xamarin.Essentials/OrientationSensor.xml
index aa17dd9ae..e12381fc9 100644
--- a/docs/en/Xamarin.Essentials/OrientationSensor.xml
+++ b/docs/en/Xamarin.Essentials/OrientationSensor.xml
@@ -12,9 +12,7 @@
   <Interfaces />
   <Docs>
     <summary>Device orientation (quaternion) relative to magnetic fields.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="IsMonitoring">
@@ -32,9 +30,7 @@
       <Docs>
         <summary>Gets of currently monitoring the sensor.</summary>
         <value>If monitoring.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="ReadingChanged">
@@ -53,9 +49,7 @@
         <summary>
           <para>Event triggered when reading of sensor changes.</para>
         </summary>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Start">
@@ -76,9 +70,7 @@
       <Docs>
         <param name="sensorSpeed">Sensor speed to use.</param>
         <summary>Starts monitoring orientation sensor with specific speed.</summary>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Stop">
@@ -96,9 +88,7 @@
       <Parameters />
       <Docs>
         <summary>Stops monitoring.</summary>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/Xamarin.Essentials/OrientationSensorChangedEventArgs.xml b/docs/en/Xamarin.Essentials/OrientationSensorChangedEventArgs.xml
index 60de9f558..e04e8a9fe 100644
--- a/docs/en/Xamarin.Essentials/OrientationSensorChangedEventArgs.xml
+++ b/docs/en/Xamarin.Essentials/OrientationSensorChangedEventArgs.xml
@@ -12,9 +12,7 @@
   <Interfaces />
   <Docs>
     <summary>Orientation event args when reading changes.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="Reading">
diff --git a/docs/en/Xamarin.Essentials/PhoneDialer.xml b/docs/en/Xamarin.Essentials/PhoneDialer.xml
index e7164399c..fd9c00e3e 100644
--- a/docs/en/Xamarin.Essentials/PhoneDialer.xml
+++ b/docs/en/Xamarin.Essentials/PhoneDialer.xml
@@ -12,9 +12,7 @@
   <Interfaces />
   <Docs>
     <summary>Open the platform phone dialer to place a call.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="Open">
@@ -36,7 +34,7 @@
         <param name="number">Phone number to initialize the dialer with. Example 15555555555</param>
         <summary>Open the phone dialer to a specific phone number.</summary>
         <remarks>
-          <para></para>Throws ArgumentNullException if number is not valid.<para>Throws FeatureNotSupportedException if placing phone call is not supported on the device.</para></remarks>
+          Throws ArgumentNullException if number is not valid.<para>Throws FeatureNotSupportedException if placing phone call is not supported on the device.</para></remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/Xamarin.Essentials/Placemark.xml b/docs/en/Xamarin.Essentials/Placemark.xml
index 58b52bfc3..c46d96289 100644
--- a/docs/en/Xamarin.Essentials/Placemark.xml
+++ b/docs/en/Xamarin.Essentials/Placemark.xml
@@ -12,9 +12,7 @@
   <Interfaces />
   <Docs>
     <summary>User-friendly description of a geographic coordinate. This contains information such as the name of the place, its address, and other information.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName=".ctor">
@@ -29,9 +27,7 @@
       <Parameters />
       <Docs>
         <summary>Default constructor for placemark.</summary>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -49,9 +45,7 @@
       <Docs>
         <param name="placemark">Placemark to copy.</param>
         <summary>Constructor to create a deep copy.</summary>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="AdminArea">
@@ -69,9 +63,7 @@
       <Docs>
         <summary>Gets or sets the administrative area name of the address, for example, "CA", or null if it is unknown.</summary>
         <value>The admin area.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="CountryCode">
@@ -89,9 +81,7 @@
       <Docs>
         <summary>Gets or sets the country ISO code.</summary>
         <value>The country ISO code.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="CountryName">
@@ -109,9 +99,7 @@
       <Docs>
         <summary>Gets or sets the country name.</summary>
         <value>The country name.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="FeatureName">
@@ -129,9 +117,7 @@
       <Docs>
         <summary>Gets or sets the feature name.</summary>
         <value>The feature name.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Locality">
@@ -149,9 +135,7 @@
       <Docs>
         <summary>Gets or sets the city or town.</summary>
         <value>The city or town of the locality.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Location">
@@ -169,9 +153,7 @@
       <Docs>
         <summary>Gets or sets the location of the placemark.</summary>
         <value>The location of the palcemark.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="PostalCode">
@@ -189,9 +171,7 @@
       <Docs>
         <summary>Gets or sets the postal code.</summary>
         <value>The postal code.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="SubAdminArea">
@@ -209,9 +189,7 @@
       <Docs>
         <summary>Gets or sets the sub-administrative area name of the address, for example, "Santa Clara County", or null if it is unknown.</summary>
         <value>The sub-admin area.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="SubLocality">
@@ -229,9 +207,7 @@
       <Docs>
         <summary>Gets or sets the sub locality.</summary>
         <value>The sub locality.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="SubThoroughfare">
@@ -249,9 +225,7 @@
       <Docs>
         <summary>Gets or sets optional info: sub street or region.</summary>
         <value>The sub thoroughfare.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Thoroughfare">
@@ -269,9 +243,7 @@
       <Docs>
         <summary>Gets or sets the street name.</summary>
         <value>The street name.</value>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="ToString">
diff --git a/docs/en/Xamarin.Essentials/Platform.xml b/docs/en/Xamarin.Essentials/Platform.xml
index 1048286c4..e808bf0d6 100644
--- a/docs/en/Xamarin.Essentials/Platform.xml
+++ b/docs/en/Xamarin.Essentials/Platform.xml
@@ -35,9 +35,7 @@
       <Docs>
         <param name="application">Application to initialize with.</param>
         <summary>Initialize Xamarin.Essentials with Android's application class.</summary>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Init">
@@ -60,9 +58,7 @@
         <param name="activity">Activity to use for initialization.</param>
         <param name="bundle">Bundle of the activity.</param>
         <summary>Initialize Xamarin.Essentials with Android's activity and bundle.</summary>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="MapServiceToken">
diff --git a/docs/en/Xamarin.Essentials/ScreenMetrics.xml b/docs/en/Xamarin.Essentials/ScreenMetrics.xml
index 0bf967535..1fc6ed9de 100644
--- a/docs/en/Xamarin.Essentials/ScreenMetrics.xml
+++ b/docs/en/Xamarin.Essentials/ScreenMetrics.xml
@@ -21,9 +21,7 @@
   </Attributes>
   <Docs>
     <summary>This type represents the properties of the current screen.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="Density">
@@ -40,9 +38,7 @@
       </ReturnValue>
       <Docs>
         <summary>Gets a value representing the current screen density.</summary>
-        <value>
-          <para></para>
-        </value>
+        <value></value>
         <remarks>This value is a multiple value, such that a retina display would be 2.0 or 3.0. On Windows, the scaling percent of 200% means that the density will be 2.0.</remarks>
       </Docs>
     </Member>
@@ -130,9 +126,7 @@
       </ReturnValue>
       <Docs>
         <summary>Gets the height of the screen for the current orientation.</summary>
-        <value>
-          <para></para>
-        </value>
+        <value></value>
         <remarks>This value is the height after rotation, so a landscape iPhone will have a smaller height than width.</remarks>
       </Docs>
     </Member>
@@ -261,9 +255,7 @@
       </ReturnValue>
       <Docs>
         <summary>Gets the width of the screen in the current orientation.</summary>
-        <value>
-          <para></para>
-        </value>
+        <value></value>
         <remarks>This value is the width after rotation, so a landscape Android phone will have a larget width than height.</remarks>
       </Docs>
     </Member>
diff --git a/docs/en/Xamarin.Essentials/SecureStorage.xml b/docs/en/Xamarin.Essentials/SecureStorage.xml
index 73ce698fc..7e25522ad 100644
--- a/docs/en/Xamarin.Essentials/SecureStorage.xml
+++ b/docs/en/Xamarin.Essentials/SecureStorage.xml
@@ -66,9 +66,7 @@
         <param name="key">Storage Key.</param>
         <summary>Gets the decrypted value for a given Key.</summary>
         <returns>Decrypted string.</returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="Remove">
@@ -131,12 +129,8 @@
         <param name="key">Storage Key.</param>
         <param name="value">The value to be encrypted.</param>
         <summary>Stores the value which is encrypted, for a given Key.</summary>
-        <returns>
-          <para></para>
-        </returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <returns></returns>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="SetAsync">
@@ -161,12 +155,8 @@
         <param name="value">The value to be encrypted.</param>
         <param name="accessible">The KeyChain accessibility to create the encrypted record with.</param>
         <summary>Stores the value which is encrypted, for a given Key. iOS override to specify SecAccessible for the KeyChain.</summary>
-        <returns>
-          <para></para>
-        </returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <returns></returns>
+        <remarks></remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/Xamarin.Essentials/SensorSpeed.xml b/docs/en/Xamarin.Essentials/SensorSpeed.xml
index cebfc84f7..8c0417951 100644
--- a/docs/en/Xamarin.Essentials/SensorSpeed.xml
+++ b/docs/en/Xamarin.Essentials/SensorSpeed.xml
@@ -11,9 +11,7 @@
   </Base>
   <Docs>
     <summary>Sensor speed to monitor for changes.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
+    <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName="Fastest">
diff --git a/docs/en/Xamarin.Essentials/Share.xml b/docs/en/Xamarin.Essentials/Share.xml
index 607a06fef..00ecae6f7 100644
--- a/docs/en/Xamarin.Essentials/Share.xml
+++ b/docs/en/Xamarin.Essentials/Share.xml
@@ -60,9 +60,7 @@
         <param name="request">Share request with options.</param>
         <summary>Show the share user interface to share text or uri.</summary>
         <returns>Task when completed.</returns>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="RequestAsync">
diff --git a/docs/en/Xamarin.Essentials/ShareTextRequest.xml b/docs/en/Xamarin.Essentials/ShareTextRequest.xml
index 279a544d1..54dfc4e7a 100644
--- a/docs/en/Xamarin.Essentials/ShareTextRequest.xml
+++ b/docs/en/Xamarin.Essentials/ShareTextRequest.xml
@@ -29,9 +29,7 @@
       <Parameters />
       <Docs>
         <summary>Default constructor.</summary>
-        <remarks>
-          <para></para>
-        </remarks>
+        <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
diff --git a/docs/en/index.xml b/docs/en/index.xml
index 59471ddc9..42bcf9b87 100644
--- a/docs/en/index.xml
+++ b/docs/en/index.xml
@@ -78,7 +78,7 @@
           <AttributeName>System.Runtime.Versioning.TargetFramework(".NETCore,Version=v5.0", FrameworkDisplayName=".NET for Windows Universal")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyInformationalVersion("1.0.0+b639765b9b7f7fbd96439a4c3dfb89a3c4720a96")</AttributeName>
+          <AttributeName>System.Reflection.AssemblyInformationalVersion("1.0.0+f24a7f28f47f83f1d82dd3de8a218b5080615dee")</AttributeName>
         </Attribute>
       </Attributes>
     </Assembly>

From a1d7038f40e2eff3e3b5fbea8bf870b82a3429af Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sat, 3 Nov 2018 01:57:00 +0200
Subject: [PATCH 18/43] Revert this to avoid conflicts

---
 docs/en/Xamarin.Essentials/DeviceInfo+Idioms.xml | 4 +++-
 docs/en/Xamarin.Essentials/DeviceInfo.xml        | 4 +++-
 docs/en/Xamarin.Essentials/DeviceType.xml        | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/en/Xamarin.Essentials/DeviceInfo+Idioms.xml b/docs/en/Xamarin.Essentials/DeviceInfo+Idioms.xml
index 68f05f9bf..40462a611 100644
--- a/docs/en/Xamarin.Essentials/DeviceInfo+Idioms.xml
+++ b/docs/en/Xamarin.Essentials/DeviceInfo+Idioms.xml
@@ -12,7 +12,9 @@
   <Interfaces />
   <Docs>
     <summary>The device idiom.</summary>
-    <remarks></remarks>
+    <remarks>
+      <para></para>
+    </remarks>
   </Docs>
   <Members>
     <Member MemberName="Desktop">
diff --git a/docs/en/Xamarin.Essentials/DeviceInfo.xml b/docs/en/Xamarin.Essentials/DeviceInfo.xml
index 53b855b84..4163a7cf9 100644
--- a/docs/en/Xamarin.Essentials/DeviceInfo.xml
+++ b/docs/en/Xamarin.Essentials/DeviceInfo.xml
@@ -172,7 +172,9 @@
       <Docs>
         <summary>Gets the version of the operating system.</summary>
         <value>The version of the operating system.</value>
-        <remarks></remarks>
+        <remarks>
+          <para></para>
+        </remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/Xamarin.Essentials/DeviceType.xml b/docs/en/Xamarin.Essentials/DeviceType.xml
index 7f509b862..aaf8d0dd2 100644
--- a/docs/en/Xamarin.Essentials/DeviceType.xml
+++ b/docs/en/Xamarin.Essentials/DeviceType.xml
@@ -11,7 +11,9 @@
   </Base>
   <Docs>
     <summary>Various types of devices.</summary>
-    <remarks></remarks>
+    <remarks>
+      <para></para>
+    </remarks>
   </Docs>
   <Members>
     <Member MemberName="Physical">

From e3a786027b255ab5243cb00bef2468a99bbc2fb9 Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Fri, 2 Nov 2018 17:48:39 -0700
Subject: [PATCH 19/43] Add in DeviceIdiom and DevicePlatform

---
 .../DeviceTests.Shared/DeviceInfo_Tests.cs    |   6 +-
 .../DeviceTests.Shared/Vibration_Tests.cs     |   4 +-
 .../Samples/ViewModel/DeviceInfoViewModel.cs  |   4 +-
 .../DeviceInfo/DeviceInfo.android.cs          |  28 +-
 .../DeviceInfo/DeviceInfo.ios.cs              |  12 +-
 .../DeviceInfo/DeviceInfo.netstandard.cs      |   4 +-
 .../DeviceInfo/DeviceInfo.shared.cs           |  33 +-
 .../DeviceInfo/DeviceInfo.uwp.cs              |  17 +-
 .../GlobalSuppressions.shared.cs              |   7 +
 .../Types/DeviceIdiom.shared.cs               |  56 ++++
 .../Types/DevicePlatform.shared.cs            |  52 ++++
 Xamarin.Essentials/Xamarin.Essentials.csproj  |   2 +-
 .../xamarin-essentials-android.xml            |  39 ++-
 .../xamarin-essentials-ios.xml                |  39 ++-
 .../xamarin-essentials-uwp.xml                |  39 ++-
 .../en/FrameworksIndex/xamarin-essentials.xml |  39 ++-
 docs/en/Xamarin.Essentials/DeviceIdiom.xml    | 293 ++++++++++++++++++
 .../Xamarin.Essentials/DeviceInfo+Idioms.xml  | 116 -------
 .../DeviceInfo+Platforms.xml                  |  97 ------
 docs/en/Xamarin.Essentials/DeviceInfo.xml     |  14 +-
 docs/en/Xamarin.Essentials/DevicePlatform.xml | 257 +++++++++++++++
 docs/en/index.xml                             |   4 +-
 22 files changed, 825 insertions(+), 337 deletions(-)
 create mode 100644 Xamarin.Essentials/GlobalSuppressions.shared.cs
 create mode 100644 Xamarin.Essentials/Types/DeviceIdiom.shared.cs
 create mode 100644 Xamarin.Essentials/Types/DevicePlatform.shared.cs
 create mode 100644 docs/en/Xamarin.Essentials/DeviceIdiom.xml
 delete mode 100644 docs/en/Xamarin.Essentials/DeviceInfo+Idioms.xml
 delete mode 100644 docs/en/Xamarin.Essentials/DeviceInfo+Platforms.xml
 create mode 100644 docs/en/Xamarin.Essentials/DevicePlatform.xml

diff --git a/DeviceTests/DeviceTests.Shared/DeviceInfo_Tests.cs b/DeviceTests/DeviceTests.Shared/DeviceInfo_Tests.cs
index 18c57653e..a80220f85 100644
--- a/DeviceTests/DeviceTests.Shared/DeviceInfo_Tests.cs
+++ b/DeviceTests/DeviceTests.Shared/DeviceInfo_Tests.cs
@@ -68,11 +68,11 @@ public void AppPackageName_Is_Correct()
         public void Platform_Is_Correct()
         {
 #if WINDOWS_UWP
-            Assert.Equal(DeviceInfo.Platforms.UWP, DeviceInfo.Platform);
+            Assert.Equal(DevicePlatform.UWP, DeviceInfo.Platform);
 #elif __IOS__
-            Assert.Equal(DeviceInfo.Platforms.iOS, DeviceInfo.Platform);
+            Assert.Equal(DevicePlatform.iOS, DeviceInfo.Platform);
 #elif __ANDROID__
-            Assert.Equal(DeviceInfo.Platforms.Android, DeviceInfo.Platform);
+            Assert.Equal(DevicePlatform.Android, DeviceInfo.Platform);
 #else
             throw new PlatformNotSupportedException();
 #endif
diff --git a/DeviceTests/DeviceTests.Shared/Vibration_Tests.cs b/DeviceTests/DeviceTests.Shared/Vibration_Tests.cs
index 815a86c03..a2371308f 100644
--- a/DeviceTests/DeviceTests.Shared/Vibration_Tests.cs
+++ b/DeviceTests/DeviceTests.Shared/Vibration_Tests.cs
@@ -17,7 +17,7 @@ public void Vibrate()
 #elif __IOS__
             // TODO: remove this as soon as the test harness can filter
             // the iOS simulator does not emulate a flashlight
-            if (DeviceInfo.DeviceType == DeviceType.Virtual && DeviceInfo.Platform == DeviceInfo.Platforms.iOS)
+            if (DeviceInfo.DeviceType == DeviceType.Virtual && DeviceInfo.Platform == DevicePlatform.iOS)
                 return;
 #endif
 
@@ -35,7 +35,7 @@ public void Vibrate_Cancel()
 #elif __IOS__
             // TODO: remove this as soon as the test harness can filter
             // the iOS simulator does not emulate a flashlight
-            if (DeviceInfo.DeviceType == DeviceType.Virtual && DeviceInfo.Platform == DeviceInfo.Platforms.iOS)
+            if (DeviceInfo.DeviceType == DeviceType.Virtual && DeviceInfo.Platform == DevicePlatform.iOS)
                 return;
 #endif
 
diff --git a/Samples/Samples/ViewModel/DeviceInfoViewModel.cs b/Samples/Samples/ViewModel/DeviceInfoViewModel.cs
index 8594f0d2e..ffdf67e6b 100644
--- a/Samples/Samples/ViewModel/DeviceInfoViewModel.cs
+++ b/Samples/Samples/ViewModel/DeviceInfoViewModel.cs
@@ -16,9 +16,9 @@ public class DeviceInfoViewModel : BaseViewModel
 
         public string Version => DeviceInfo.Version.ToString();
 
-        public string Platform => DeviceInfo.Platform;
+        public DevicePlatform Platform => DeviceInfo.Platform;
 
-        public string Idiom => DeviceInfo.Idiom;
+        public DeviceIdiom Idiom => DeviceInfo.Idiom;
 
         public DeviceType DeviceType => DeviceInfo.DeviceType;
 
diff --git a/Xamarin.Essentials/DeviceInfo/DeviceInfo.android.cs b/Xamarin.Essentials/DeviceInfo/DeviceInfo.android.cs
index 6ddf53c21..38f163101 100644
--- a/Xamarin.Essentials/DeviceInfo/DeviceInfo.android.cs
+++ b/Xamarin.Essentials/DeviceInfo/DeviceInfo.android.cs
@@ -24,11 +24,11 @@ static string GetDeviceName()
 
         static string GetVersionString() => Build.VERSION.Release;
 
-        static string GetPlatform() => Platforms.Android;
+        static DevicePlatform GetPlatform() => DevicePlatform.Android;
 
-        static string GetIdiom()
+        static DeviceIdiom GetIdiom()
         {
-            var currentIdiom = Idioms.Unsupported;
+            var currentIdiom = DeviceIdiom.Unknown;
 
             // first try UIModeManager
             using (var uiModeManager = UiModeManager.FromContext(Essentials.Platform.AppContext))
@@ -38,7 +38,7 @@ static string GetIdiom()
             }
 
             // then try Configuration
-            if (currentIdiom == Idioms.Unsupported)
+            if (currentIdiom == DeviceIdiom.Unknown)
             {
                 var configuration = Essentials.Platform.AppContext.Resources?.Configuration;
                 if (configuration != null)
@@ -47,24 +47,24 @@ static string GetIdiom()
                     currentIdiom = DetectIdiom(uiMode);
 
                     // now just guess
-                    if (currentIdiom == Idioms.Unsupported)
+                    if (currentIdiom == DeviceIdiom.Unknown)
                     {
                         var minWidth = configuration.SmallestScreenWidthDp;
                         var isWide = minWidth >= tabletCrossover;
-                        currentIdiom = isWide ? Idioms.Tablet : Idioms.Phone;
+                        currentIdiom = isWide ? DeviceIdiom.Tablet : DeviceIdiom.Phone;
                     }
                 }
             }
 
             // start clutching at straws
-            if (currentIdiom == Idioms.Unsupported)
+            if (currentIdiom == DeviceIdiom.Unknown)
             {
                 var metrics = Essentials.Platform.AppContext.Resources?.DisplayMetrics;
                 if (metrics != null)
                 {
                     var minSize = Math.Min(metrics.WidthPixels, metrics.HeightPixels);
                     var isWide = minSize * metrics.Density >= tabletCrossover;
-                    currentIdiom = isWide ? Idioms.Tablet : Idioms.Phone;
+                    currentIdiom = isWide ? DeviceIdiom.Tablet : DeviceIdiom.Phone;
                 }
             }
 
@@ -72,16 +72,18 @@ static string GetIdiom()
             return currentIdiom;
         }
 
-        static string DetectIdiom(UiMode uiMode)
+        static DeviceIdiom DetectIdiom(UiMode uiMode)
         {
             if (uiMode.HasFlag(UiMode.TypeNormal))
-                return Idioms.Phone;
+                return DeviceIdiom.Phone;
             else if (uiMode.HasFlag(UiMode.TypeTelevision))
-                return Idioms.TV;
+                return DeviceIdiom.TV;
             else if (uiMode.HasFlag(UiMode.TypeDesk))
-                return Idioms.Desktop;
+                return DeviceIdiom.Desktop;
+            else if (Essentials.Platform.HasApiLevel(BuildVersionCodes.KitkatWatch) && uiMode.HasFlag(UiMode.TypeWatch))
+                return DeviceIdiom.Watch;
 
-            return Idioms.Unsupported;
+            return DeviceIdiom.Unknown;
         }
 
         static DeviceType GetDeviceType()
diff --git a/Xamarin.Essentials/DeviceInfo/DeviceInfo.ios.cs b/Xamarin.Essentials/DeviceInfo/DeviceInfo.ios.cs
index f1195fdf4..d69098a0c 100644
--- a/Xamarin.Essentials/DeviceInfo/DeviceInfo.ios.cs
+++ b/Xamarin.Essentials/DeviceInfo/DeviceInfo.ios.cs
@@ -26,22 +26,22 @@ static string GetModel()
 
         static string GetVersionString() => UIDevice.CurrentDevice.SystemVersion;
 
-        static string GetPlatform() => Platforms.iOS;
+        static DevicePlatform GetPlatform() => DevicePlatform.iOS;
 
-        static string GetIdiom()
+        static DeviceIdiom GetIdiom()
         {
             switch (UIDevice.CurrentDevice.UserInterfaceIdiom)
             {
                 case UIUserInterfaceIdiom.Pad:
-                    return Idioms.Tablet;
+                    return DeviceIdiom.Tablet;
                 case UIUserInterfaceIdiom.Phone:
-                    return Idioms.Phone;
+                    return DeviceIdiom.Phone;
                 case UIUserInterfaceIdiom.TV:
-                    return Idioms.TV;
+                    return DeviceIdiom.TV;
                 case UIUserInterfaceIdiom.CarPlay:
                 case UIUserInterfaceIdiom.Unspecified:
                 default:
-                    return Idioms.Unsupported;
+                    return DeviceIdiom.Unknown;
             }
         }
 
diff --git a/Xamarin.Essentials/DeviceInfo/DeviceInfo.netstandard.cs b/Xamarin.Essentials/DeviceInfo/DeviceInfo.netstandard.cs
index 4e54c25f5..0c583a4e6 100644
--- a/Xamarin.Essentials/DeviceInfo/DeviceInfo.netstandard.cs
+++ b/Xamarin.Essentials/DeviceInfo/DeviceInfo.netstandard.cs
@@ -10,9 +10,9 @@ public static partial class DeviceInfo
 
         static string GetVersionString() => throw new NotImplementedInReferenceAssemblyException();
 
-        static string GetPlatform() => throw new NotImplementedInReferenceAssemblyException();
+        static DevicePlatform GetPlatform() => throw new NotImplementedInReferenceAssemblyException();
 
-        static string GetIdiom() => throw new NotImplementedInReferenceAssemblyException();
+        static DeviceIdiom GetIdiom() => throw new NotImplementedInReferenceAssemblyException();
 
         static DeviceType GetDeviceType() => throw new NotImplementedInReferenceAssemblyException();
     }
diff --git a/Xamarin.Essentials/DeviceInfo/DeviceInfo.shared.cs b/Xamarin.Essentials/DeviceInfo/DeviceInfo.shared.cs
index cd056839d..ae705e35d 100644
--- a/Xamarin.Essentials/DeviceInfo/DeviceInfo.shared.cs
+++ b/Xamarin.Essentials/DeviceInfo/DeviceInfo.shared.cs
@@ -14,41 +14,16 @@ public static partial class DeviceInfo
 
         public static Version Version => Utils.ParseVersion(VersionString);
 
-        public static string Platform => GetPlatform();
+        public static DevicePlatform Platform => GetPlatform();
 
-        public static string Idiom => GetIdiom();
+        public static DeviceIdiom Idiom => GetIdiom();
 
         public static DeviceType DeviceType => GetDeviceType();
-
-        public static class Idioms
-        {
-            // try to match Xamarin.Forms:
-            // https://github.com/xamarin/Xamarin.Forms/blob/2.5.1/Xamarin.Forms.Core/TargetIdiom.cs
-
-            public const string Phone = "Phone";
-            public const string Tablet = "Tablet";
-            public const string Desktop = "Desktop";
-            public const string TV = "TV";
-
-            public const string Unsupported = "Unsupported";
-        }
-
-        public static class Platforms
-        {
-            // try to match Xamarin.Forms:
-            // https://github.com/xamarin/Xamarin.Forms/blob/2.5.1/Xamarin.Forms.Core/Device.cs#L14-L19
-
-            public const string iOS = "iOS";
-            public const string Android = "Android";
-            public const string UWP = "UWP";
-
-            public const string Unsupported = "Unsupported";
-        }
     }
 
     public enum DeviceType
     {
-        Physical,
-        Virtual
+        Physical = 0,
+        Virtual = 1
     }
 }
diff --git a/Xamarin.Essentials/DeviceInfo/DeviceInfo.uwp.cs b/Xamarin.Essentials/DeviceInfo/DeviceInfo.uwp.cs
index 176b12964..2b027addf 100644
--- a/Xamarin.Essentials/DeviceInfo/DeviceInfo.uwp.cs
+++ b/Xamarin.Essentials/DeviceInfo/DeviceInfo.uwp.cs
@@ -1,5 +1,4 @@
-using Windows.Graphics.Display;
-using Windows.Security.ExchangeActiveSyncProvisioning;
+using Windows.Security.ExchangeActiveSyncProvisioning;
 using Windows.System.Profile;
 using Windows.UI.ViewManagement;
 
@@ -36,28 +35,28 @@ static string GetVersionString()
             return version;
         }
 
-        static string GetPlatform() => Platforms.UWP;
+        static DevicePlatform GetPlatform() => DevicePlatform.UWP;
 
-        static string GetIdiom()
+        static DeviceIdiom GetIdiom()
         {
             switch (AnalyticsInfo.VersionInfo.DeviceFamily)
             {
                 case "Windows.Mobile":
-                    return Idioms.Phone;
+                    return DeviceIdiom.Phone;
                 case "Windows.Universal":
                 case "Windows.Desktop":
                     {
                         var uiMode = UIViewSettings.GetForCurrentView().UserInteractionMode;
-                        return uiMode == UserInteractionMode.Mouse ? Idioms.Desktop : Idioms.Tablet;
+                        return uiMode == UserInteractionMode.Mouse ? DeviceIdiom.Desktop : DeviceIdiom.Tablet;
                     }
                 case "Windows.Xbox":
                 case "Windows.Team":
-                    return Idioms.TV;
+                    return DeviceIdiom.TV;
                 case "Windows.IoT":
-                    return Idioms.Unsupported;
+                    return DeviceIdiom.Unknown;
             }
 
-            return Idioms.Unsupported;
+            return DeviceIdiom.Unknown;
         }
 
         static DeviceType GetDeviceType()
diff --git a/Xamarin.Essentials/GlobalSuppressions.shared.cs b/Xamarin.Essentials/GlobalSuppressions.shared.cs
new file mode 100644
index 000000000..5fcb8feb7
--- /dev/null
+++ b/Xamarin.Essentials/GlobalSuppressions.shared.cs
@@ -0,0 +1,7 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "iOS is what we want.", Scope = "member", Target = "~P:Xamarin.Essentials.DevicePlatform.iOS")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "iOS is what we want.", Scope = "member", Target = "~P:Xamarin.Essentials.DevicePlatform.iOS")]
diff --git a/Xamarin.Essentials/Types/DeviceIdiom.shared.cs b/Xamarin.Essentials/Types/DeviceIdiom.shared.cs
new file mode 100644
index 000000000..731748a5c
--- /dev/null
+++ b/Xamarin.Essentials/Types/DeviceIdiom.shared.cs
@@ -0,0 +1,56 @@
+using System;
+
+namespace Xamarin.Essentials
+{
+    public readonly struct DeviceIdiom : IEquatable<DeviceIdiom>
+    {
+        readonly string deviceIdiom;
+
+        public static DeviceIdiom Phone { get; } = new DeviceIdiom(nameof(Phone));
+
+        public static DeviceIdiom Tablet { get; } = new DeviceIdiom(nameof(Tablet));
+
+        public static DeviceIdiom Desktop { get; } = new DeviceIdiom(nameof(Desktop));
+
+        public static DeviceIdiom TV { get; } = new DeviceIdiom(nameof(TV));
+
+        public static DeviceIdiom Watch { get; } = new DeviceIdiom(nameof(Watch));
+
+        public static DeviceIdiom Unknown { get; } = new DeviceIdiom(nameof(Unknown));
+
+        DeviceIdiom(string deviceIdiom)
+        {
+            if (deviceIdiom == null)
+                throw new ArgumentNullException(nameof(deviceIdiom));
+
+            if (deviceIdiom.Length == 0)
+                throw new ArgumentException(nameof(deviceIdiom));
+
+            this.deviceIdiom = deviceIdiom;
+        }
+
+        public static DeviceIdiom Create(string deviceIdiom) =>
+            new DeviceIdiom(deviceIdiom);
+
+        public bool Equals(DeviceIdiom other) =>
+            Equals(other.deviceIdiom);
+
+        internal bool Equals(string other) =>
+            string.Equals(deviceIdiom, other, StringComparison.Ordinal);
+
+        public override bool Equals(object obj) =>
+            obj is DeviceIdiom && Equals((DeviceIdiom)obj);
+
+        public override int GetHashCode() =>
+            deviceIdiom == null ? 0 : deviceIdiom.GetHashCode();
+
+        public override string ToString() =>
+            deviceIdiom ?? string.Empty;
+
+        public static bool operator ==(DeviceIdiom left, DeviceIdiom right) =>
+            left.Equals(right);
+
+        public static bool operator !=(DeviceIdiom left, DeviceIdiom right) =>
+            !(left == right);
+    }
+}
diff --git a/Xamarin.Essentials/Types/DevicePlatform.shared.cs b/Xamarin.Essentials/Types/DevicePlatform.shared.cs
new file mode 100644
index 000000000..7d38c767b
--- /dev/null
+++ b/Xamarin.Essentials/Types/DevicePlatform.shared.cs
@@ -0,0 +1,52 @@
+using System;
+
+namespace Xamarin.Essentials
+{
+    public readonly struct DevicePlatform : IEquatable<DevicePlatform>
+    {
+        readonly string deviceIdiom;
+
+        public static DevicePlatform Android { get; } = new DevicePlatform(nameof(Android));
+
+        public static DevicePlatform iOS { get; } = new DevicePlatform(nameof(iOS));
+
+        public static DevicePlatform UWP { get; } = new DevicePlatform(nameof(UWP));
+
+        public static DevicePlatform Unknown { get; } = new DevicePlatform(nameof(Unknown));
+
+        DevicePlatform(string deviceIdiom)
+        {
+            if (deviceIdiom == null)
+                throw new ArgumentNullException(nameof(deviceIdiom));
+
+            if (deviceIdiom.Length == 0)
+                throw new ArgumentException(nameof(deviceIdiom));
+
+            this.deviceIdiom = deviceIdiom;
+        }
+
+        public static DevicePlatform Create(string deviceIdiom) =>
+            new DevicePlatform(deviceIdiom);
+
+        public bool Equals(DevicePlatform other) =>
+            Equals(other.deviceIdiom);
+
+        internal bool Equals(string other) =>
+            string.Equals(deviceIdiom, other, StringComparison.Ordinal);
+
+        public override bool Equals(object obj) =>
+            obj is DevicePlatform && Equals((DevicePlatform)obj);
+
+        public override int GetHashCode() =>
+            deviceIdiom == null ? 0 : deviceIdiom.GetHashCode();
+
+        public override string ToString() =>
+            deviceIdiom ?? string.Empty;
+
+        public static bool operator ==(DevicePlatform left, DevicePlatform right) =>
+            left.Equals(right);
+
+        public static bool operator !=(DevicePlatform left, DevicePlatform right) =>
+            !(left == right);
+    }
+}
diff --git a/Xamarin.Essentials/Xamarin.Essentials.csproj b/Xamarin.Essentials/Xamarin.Essentials.csproj
index 3587d7d15..6afcea55d 100644
--- a/Xamarin.Essentials/Xamarin.Essentials.csproj
+++ b/Xamarin.Essentials/Xamarin.Essentials.csproj
@@ -50,7 +50,7 @@
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
   <ItemGroup Condition=" '$(Configuration)'=='Release' And '$(OS)' == 'Windows_NT' ">
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All"/>    
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All" />    
   </ItemGroup>
   <ItemGroup>
     <None Include="..\nugetreadme.txt" PackagePath="readme.txt" Pack="true" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-android.xml b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
index 8b022c0f8..61e401388 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-android.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
@@ -131,6 +131,21 @@
       <Member Id="E:Xamarin.Essentials.DeviceDisplay.ScreenMetricsChanged" />
       <Member Id="P:Xamarin.Essentials.DeviceDisplay.ScreenMetrics" />
     </Type>
+    <Type Name="Xamarin.Essentials.DeviceIdiom" Id="T:Xamarin.Essentials.DeviceIdiom">
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.Create(System.String)" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.Equals(System.Object)" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.Equals(Xamarin.Essentials.DeviceIdiom)" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.GetHashCode" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.op_Equality(Xamarin.Essentials.DeviceIdiom,Xamarin.Essentials.DeviceIdiom)" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.op_Inequality(Xamarin.Essentials.DeviceIdiom,Xamarin.Essentials.DeviceIdiom)" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.ToString" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.Desktop" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.Phone" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.Tablet" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.TV" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.Unknown" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.Watch" />
+    </Type>
     <Type Name="Xamarin.Essentials.DeviceInfo" Id="T:Xamarin.Essentials.DeviceInfo">
       <Member Id="P:Xamarin.Essentials.DeviceInfo.DeviceType" />
       <Member Id="P:Xamarin.Essentials.DeviceInfo.Idiom" />
@@ -141,18 +156,18 @@
       <Member Id="P:Xamarin.Essentials.DeviceInfo.Version" />
       <Member Id="P:Xamarin.Essentials.DeviceInfo.VersionString" />
     </Type>
-    <Type Name="Xamarin.Essentials.DeviceInfo/Idioms" Id="T:Xamarin.Essentials.DeviceInfo.Idioms">
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Idioms.Desktop" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Idioms.Phone" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Idioms.Tablet" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Idioms.TV" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Idioms.Unsupported" />
-    </Type>
-    <Type Name="Xamarin.Essentials.DeviceInfo/Platforms" Id="T:Xamarin.Essentials.DeviceInfo.Platforms">
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Platforms.Android" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Platforms.iOS" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Platforms.Unsupported" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Platforms.UWP" />
+    <Type Name="Xamarin.Essentials.DevicePlatform" Id="T:Xamarin.Essentials.DevicePlatform">
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.Create(System.String)" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.Equals(System.Object)" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.Equals(Xamarin.Essentials.DevicePlatform)" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.GetHashCode" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.op_Equality(Xamarin.Essentials.DevicePlatform,Xamarin.Essentials.DevicePlatform)" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.op_Inequality(Xamarin.Essentials.DevicePlatform,Xamarin.Essentials.DevicePlatform)" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.ToString" />
+      <Member Id="P:Xamarin.Essentials.DevicePlatform.Android" />
+      <Member Id="P:Xamarin.Essentials.DevicePlatform.iOS" />
+      <Member Id="P:Xamarin.Essentials.DevicePlatform.Unknown" />
+      <Member Id="P:Xamarin.Essentials.DevicePlatform.UWP" />
     </Type>
     <Type Name="Xamarin.Essentials.DeviceType" Id="T:Xamarin.Essentials.DeviceType">
       <Member Id="F:Xamarin.Essentials.DeviceType.Physical" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
index 9e38822a5..c55a69824 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
@@ -132,6 +132,21 @@
       <Member Id="E:Xamarin.Essentials.DeviceDisplay.ScreenMetricsChanged" />
       <Member Id="P:Xamarin.Essentials.DeviceDisplay.ScreenMetrics" />
     </Type>
+    <Type Name="Xamarin.Essentials.DeviceIdiom" Id="T:Xamarin.Essentials.DeviceIdiom">
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.Create(System.String)" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.Equals(System.Object)" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.Equals(Xamarin.Essentials.DeviceIdiom)" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.GetHashCode" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.op_Equality(Xamarin.Essentials.DeviceIdiom,Xamarin.Essentials.DeviceIdiom)" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.op_Inequality(Xamarin.Essentials.DeviceIdiom,Xamarin.Essentials.DeviceIdiom)" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.ToString" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.Desktop" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.Phone" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.Tablet" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.TV" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.Unknown" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.Watch" />
+    </Type>
     <Type Name="Xamarin.Essentials.DeviceInfo" Id="T:Xamarin.Essentials.DeviceInfo">
       <Member Id="P:Xamarin.Essentials.DeviceInfo.DeviceType" />
       <Member Id="P:Xamarin.Essentials.DeviceInfo.Idiom" />
@@ -142,18 +157,18 @@
       <Member Id="P:Xamarin.Essentials.DeviceInfo.Version" />
       <Member Id="P:Xamarin.Essentials.DeviceInfo.VersionString" />
     </Type>
-    <Type Name="Xamarin.Essentials.DeviceInfo/Idioms" Id="T:Xamarin.Essentials.DeviceInfo.Idioms">
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Idioms.Desktop" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Idioms.Phone" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Idioms.Tablet" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Idioms.TV" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Idioms.Unsupported" />
-    </Type>
-    <Type Name="Xamarin.Essentials.DeviceInfo/Platforms" Id="T:Xamarin.Essentials.DeviceInfo.Platforms">
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Platforms.Android" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Platforms.iOS" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Platforms.Unsupported" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Platforms.UWP" />
+    <Type Name="Xamarin.Essentials.DevicePlatform" Id="T:Xamarin.Essentials.DevicePlatform">
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.Create(System.String)" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.Equals(System.Object)" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.Equals(Xamarin.Essentials.DevicePlatform)" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.GetHashCode" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.op_Equality(Xamarin.Essentials.DevicePlatform,Xamarin.Essentials.DevicePlatform)" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.op_Inequality(Xamarin.Essentials.DevicePlatform,Xamarin.Essentials.DevicePlatform)" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.ToString" />
+      <Member Id="P:Xamarin.Essentials.DevicePlatform.Android" />
+      <Member Id="P:Xamarin.Essentials.DevicePlatform.iOS" />
+      <Member Id="P:Xamarin.Essentials.DevicePlatform.Unknown" />
+      <Member Id="P:Xamarin.Essentials.DevicePlatform.UWP" />
     </Type>
     <Type Name="Xamarin.Essentials.DeviceType" Id="T:Xamarin.Essentials.DeviceType">
       <Member Id="F:Xamarin.Essentials.DeviceType.Physical" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
index 5c04edf94..794c5dedd 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
@@ -131,6 +131,21 @@
       <Member Id="E:Xamarin.Essentials.DeviceDisplay.ScreenMetricsChanged" />
       <Member Id="P:Xamarin.Essentials.DeviceDisplay.ScreenMetrics" />
     </Type>
+    <Type Name="Xamarin.Essentials.DeviceIdiom" Id="T:Xamarin.Essentials.DeviceIdiom">
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.Create(System.String)" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.Equals(System.Object)" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.Equals(Xamarin.Essentials.DeviceIdiom)" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.GetHashCode" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.op_Equality(Xamarin.Essentials.DeviceIdiom,Xamarin.Essentials.DeviceIdiom)" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.op_Inequality(Xamarin.Essentials.DeviceIdiom,Xamarin.Essentials.DeviceIdiom)" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.ToString" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.Desktop" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.Phone" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.Tablet" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.TV" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.Unknown" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.Watch" />
+    </Type>
     <Type Name="Xamarin.Essentials.DeviceInfo" Id="T:Xamarin.Essentials.DeviceInfo">
       <Member Id="P:Xamarin.Essentials.DeviceInfo.DeviceType" />
       <Member Id="P:Xamarin.Essentials.DeviceInfo.Idiom" />
@@ -141,18 +156,18 @@
       <Member Id="P:Xamarin.Essentials.DeviceInfo.Version" />
       <Member Id="P:Xamarin.Essentials.DeviceInfo.VersionString" />
     </Type>
-    <Type Name="Xamarin.Essentials.DeviceInfo/Idioms" Id="T:Xamarin.Essentials.DeviceInfo.Idioms">
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Idioms.Desktop" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Idioms.Phone" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Idioms.Tablet" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Idioms.TV" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Idioms.Unsupported" />
-    </Type>
-    <Type Name="Xamarin.Essentials.DeviceInfo/Platforms" Id="T:Xamarin.Essentials.DeviceInfo.Platforms">
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Platforms.Android" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Platforms.iOS" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Platforms.Unsupported" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Platforms.UWP" />
+    <Type Name="Xamarin.Essentials.DevicePlatform" Id="T:Xamarin.Essentials.DevicePlatform">
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.Create(System.String)" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.Equals(System.Object)" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.Equals(Xamarin.Essentials.DevicePlatform)" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.GetHashCode" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.op_Equality(Xamarin.Essentials.DevicePlatform,Xamarin.Essentials.DevicePlatform)" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.op_Inequality(Xamarin.Essentials.DevicePlatform,Xamarin.Essentials.DevicePlatform)" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.ToString" />
+      <Member Id="P:Xamarin.Essentials.DevicePlatform.Android" />
+      <Member Id="P:Xamarin.Essentials.DevicePlatform.iOS" />
+      <Member Id="P:Xamarin.Essentials.DevicePlatform.Unknown" />
+      <Member Id="P:Xamarin.Essentials.DevicePlatform.UWP" />
     </Type>
     <Type Name="Xamarin.Essentials.DeviceType" Id="T:Xamarin.Essentials.DeviceType">
       <Member Id="F:Xamarin.Essentials.DeviceType.Physical" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials.xml b/docs/en/FrameworksIndex/xamarin-essentials.xml
index 5308fa25c..1c4013eaf 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials.xml
@@ -131,6 +131,21 @@
       <Member Id="E:Xamarin.Essentials.DeviceDisplay.ScreenMetricsChanged" />
       <Member Id="P:Xamarin.Essentials.DeviceDisplay.ScreenMetrics" />
     </Type>
+    <Type Name="Xamarin.Essentials.DeviceIdiom" Id="T:Xamarin.Essentials.DeviceIdiom">
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.Create(System.String)" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.Equals(System.Object)" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.Equals(Xamarin.Essentials.DeviceIdiom)" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.GetHashCode" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.op_Equality(Xamarin.Essentials.DeviceIdiom,Xamarin.Essentials.DeviceIdiom)" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.op_Inequality(Xamarin.Essentials.DeviceIdiom,Xamarin.Essentials.DeviceIdiom)" />
+      <Member Id="M:Xamarin.Essentials.DeviceIdiom.ToString" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.Desktop" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.Phone" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.Tablet" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.TV" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.Unknown" />
+      <Member Id="P:Xamarin.Essentials.DeviceIdiom.Watch" />
+    </Type>
     <Type Name="Xamarin.Essentials.DeviceInfo" Id="T:Xamarin.Essentials.DeviceInfo">
       <Member Id="P:Xamarin.Essentials.DeviceInfo.DeviceType" />
       <Member Id="P:Xamarin.Essentials.DeviceInfo.Idiom" />
@@ -141,18 +156,18 @@
       <Member Id="P:Xamarin.Essentials.DeviceInfo.Version" />
       <Member Id="P:Xamarin.Essentials.DeviceInfo.VersionString" />
     </Type>
-    <Type Name="Xamarin.Essentials.DeviceInfo/Idioms" Id="T:Xamarin.Essentials.DeviceInfo.Idioms">
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Idioms.Desktop" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Idioms.Phone" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Idioms.Tablet" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Idioms.TV" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Idioms.Unsupported" />
-    </Type>
-    <Type Name="Xamarin.Essentials.DeviceInfo/Platforms" Id="T:Xamarin.Essentials.DeviceInfo.Platforms">
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Platforms.Android" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Platforms.iOS" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Platforms.Unsupported" />
-      <Member Id="F:Xamarin.Essentials.DeviceInfo.Platforms.UWP" />
+    <Type Name="Xamarin.Essentials.DevicePlatform" Id="T:Xamarin.Essentials.DevicePlatform">
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.Create(System.String)" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.Equals(System.Object)" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.Equals(Xamarin.Essentials.DevicePlatform)" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.GetHashCode" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.op_Equality(Xamarin.Essentials.DevicePlatform,Xamarin.Essentials.DevicePlatform)" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.op_Inequality(Xamarin.Essentials.DevicePlatform,Xamarin.Essentials.DevicePlatform)" />
+      <Member Id="M:Xamarin.Essentials.DevicePlatform.ToString" />
+      <Member Id="P:Xamarin.Essentials.DevicePlatform.Android" />
+      <Member Id="P:Xamarin.Essentials.DevicePlatform.iOS" />
+      <Member Id="P:Xamarin.Essentials.DevicePlatform.Unknown" />
+      <Member Id="P:Xamarin.Essentials.DevicePlatform.UWP" />
     </Type>
     <Type Name="Xamarin.Essentials.DeviceType" Id="T:Xamarin.Essentials.DeviceType">
       <Member Id="F:Xamarin.Essentials.DeviceType.Physical" />
diff --git a/docs/en/Xamarin.Essentials/DeviceIdiom.xml b/docs/en/Xamarin.Essentials/DeviceIdiom.xml
new file mode 100644
index 000000000..50e9113dc
--- /dev/null
+++ b/docs/en/Xamarin.Essentials/DeviceIdiom.xml
@@ -0,0 +1,293 @@
+<Type Name="DeviceIdiom" FullName="Xamarin.Essentials.DeviceIdiom">
+  <TypeSignature Language="C#" Value="public struct DeviceIdiom : IEquatable&lt;Xamarin.Essentials.DeviceIdiom&gt;" />
+  <TypeSignature Language="ILAsm" Value=".class public sequential ansi sealed beforefieldinit DeviceIdiom extends System.ValueType implements class System.IEquatable`1&lt;valuetype Xamarin.Essentials.DeviceIdiom&gt;" />
+  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.DeviceIdiom" />
+  <AssemblyInfo>
+    <AssemblyName>Xamarin.Essentials</AssemblyName>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+  </AssemblyInfo>
+  <Base>
+    <BaseTypeName>System.ValueType</BaseTypeName>
+  </Base>
+  <Interfaces>
+    <Interface>
+      <InterfaceName>System.IEquatable&lt;Xamarin.Essentials.DeviceIdiom&gt;</InterfaceName>
+    </Interface>
+  </Interfaces>
+  <Attributes>
+    <Attribute FrameworkAlternate="xamarin-essentials-android;xamarin-essentials-ios;xamarin-essentials-uwp">
+      <AttributeName>System.Runtime.CompilerServices.IsReadOnly</AttributeName>
+    </Attribute>
+  </Attributes>
+  <Docs>
+    <summary>The idiom (form factor) of the device.</summary>
+    <remarks>
+      <para></para>
+    </remarks>
+  </Docs>
+  <Members>
+    <Member MemberName="Create">
+      <MemberSignature Language="C#" Value="public static Xamarin.Essentials.DeviceIdiom Create (string deviceIdiom);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig valuetype Xamarin.Essentials.DeviceIdiom Create(string deviceIdiom) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DeviceIdiom.Create(System.String)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Xamarin.Essentials.DeviceIdiom</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="deviceIdiom" Type="System.String" />
+      </Parameters>
+      <Docs>
+        <param name="deviceIdiom">To be added.</param>
+        <summary>Creates a new device idiom.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Desktop">
+      <MemberSignature Language="C#" Value="public static Xamarin.Essentials.DeviceIdiom Desktop { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property valuetype Xamarin.Essentials.DeviceIdiom Desktop" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.DeviceIdiom.Desktop" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Xamarin.Essentials.DeviceIdiom</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Gets the desktop idiom.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Equals">
+      <MemberSignature Language="C#" Value="public override bool Equals (object obj);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance bool Equals(object obj) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DeviceIdiom.Equals(System.Object)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="obj" Type="System.Object" />
+      </Parameters>
+      <Docs>
+        <param name="obj">To be added.</param>
+        <summary>Checks the equality of the idiom.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Equals">
+      <MemberSignature Language="C#" Value="public bool Equals (Xamarin.Essentials.DeviceIdiom other);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance bool Equals(valuetype Xamarin.Essentials.DeviceIdiom other) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DeviceIdiom.Equals(Xamarin.Essentials.DeviceIdiom)" />
+      <MemberType>Method</MemberType>
+      <Implements>
+        <InterfaceMember>M:System.IEquatable`1.Equals(`0)</InterfaceMember>
+      </Implements>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="other" Type="Xamarin.Essentials.DeviceIdiom" />
+      </Parameters>
+      <Docs>
+        <param name="other">To be added.</param>
+        <summary>Checks the equality of the idiom.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="GetHashCode">
+      <MemberSignature Language="C#" Value="public override int GetHashCode ();" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance int32 GetHashCode() cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DeviceIdiom.GetHashCode" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Int32</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>Gets the hash code for the idom.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="op_Equality">
+      <MemberSignature Language="C#" Value="public static bool operator == (Xamarin.Essentials.DeviceIdiom left, Xamarin.Essentials.DeviceIdiom right);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig specialname bool op_Equality(valuetype Xamarin.Essentials.DeviceIdiom left, valuetype Xamarin.Essentials.DeviceIdiom right) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DeviceIdiom.op_Equality(Xamarin.Essentials.DeviceIdiom,Xamarin.Essentials.DeviceIdiom)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="left" Type="Xamarin.Essentials.DeviceIdiom" />
+        <Parameter Name="right" Type="Xamarin.Essentials.DeviceIdiom" />
+      </Parameters>
+      <Docs>
+        <param name="left">To be added.</param>
+        <param name="right">To be added.</param>
+        <summary>Checks the equality of the idiom.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="op_Inequality">
+      <MemberSignature Language="C#" Value="public static bool operator != (Xamarin.Essentials.DeviceIdiom left, Xamarin.Essentials.DeviceIdiom right);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig specialname bool op_Inequality(valuetype Xamarin.Essentials.DeviceIdiom left, valuetype Xamarin.Essentials.DeviceIdiom right) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DeviceIdiom.op_Inequality(Xamarin.Essentials.DeviceIdiom,Xamarin.Essentials.DeviceIdiom)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="left" Type="Xamarin.Essentials.DeviceIdiom" />
+        <Parameter Name="right" Type="Xamarin.Essentials.DeviceIdiom" />
+      </Parameters>
+      <Docs>
+        <param name="left">To be added.</param>
+        <param name="right">To be added.</param>
+        <summary>Checks the equality of the idiom.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Phone">
+      <MemberSignature Language="C#" Value="public static Xamarin.Essentials.DeviceIdiom Phone { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property valuetype Xamarin.Essentials.DeviceIdiom Phone" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.DeviceIdiom.Phone" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Xamarin.Essentials.DeviceIdiom</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Gets the phone idiom.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Tablet">
+      <MemberSignature Language="C#" Value="public static Xamarin.Essentials.DeviceIdiom Tablet { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property valuetype Xamarin.Essentials.DeviceIdiom Tablet" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.DeviceIdiom.Tablet" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Xamarin.Essentials.DeviceIdiom</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Gets the tablet idiom.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="ToString">
+      <MemberSignature Language="C#" Value="public override string ToString ();" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance string ToString() cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DeviceIdiom.ToString" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.String</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>String representation of the idiom.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="TV">
+      <MemberSignature Language="C#" Value="public static Xamarin.Essentials.DeviceIdiom TV { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property valuetype Xamarin.Essentials.DeviceIdiom TV" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.DeviceIdiom.TV" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Xamarin.Essentials.DeviceIdiom</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Gets the TV idiom.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Unknown">
+      <MemberSignature Language="C#" Value="public static Xamarin.Essentials.DeviceIdiom Unknown { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property valuetype Xamarin.Essentials.DeviceIdiom Unknown" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.DeviceIdiom.Unknown" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Xamarin.Essentials.DeviceIdiom</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Gets the unknown idiom.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Watch">
+      <MemberSignature Language="C#" Value="public static Xamarin.Essentials.DeviceIdiom Watch { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property valuetype Xamarin.Essentials.DeviceIdiom Watch" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.DeviceIdiom.Watch" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Xamarin.Essentials.DeviceIdiom</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Gets the watch idiom.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+  </Members>
+</Type>
diff --git a/docs/en/Xamarin.Essentials/DeviceInfo+Idioms.xml b/docs/en/Xamarin.Essentials/DeviceInfo+Idioms.xml
deleted file mode 100644
index 40462a611..000000000
--- a/docs/en/Xamarin.Essentials/DeviceInfo+Idioms.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<Type Name="DeviceInfo+Idioms" FullName="Xamarin.Essentials.DeviceInfo+Idioms">
-  <TypeSignature Language="C#" Value="public static class DeviceInfo.Idioms" />
-  <TypeSignature Language="ILAsm" Value=".class nested public auto ansi abstract sealed beforefieldinit DeviceInfo/Idioms extends System.Object" />
-  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.DeviceInfo.Idioms" />
-  <AssemblyInfo>
-    <AssemblyName>Xamarin.Essentials</AssemblyName>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <summary>The device idiom.</summary>
-    <remarks>
-      <para></para>
-    </remarks>
-  </Docs>
-  <Members>
-    <Member MemberName="Desktop">
-      <MemberSignature Language="C#" Value="public const string Desktop;" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal string Desktop" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.DeviceInfo.Idioms.Desktop" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>A desktop device such as laptop or tower.</summary>
-        <remarks>
-          <para />
-        </remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Phone">
-      <MemberSignature Language="C#" Value="public const string Phone;" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal string Phone" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.DeviceInfo.Idioms.Phone" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>A mobile phone.</summary>
-        <remarks>
-          <para />
-        </remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Tablet">
-      <MemberSignature Language="C#" Value="public const string Tablet;" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal string Tablet" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.DeviceInfo.Idioms.Tablet" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>A tablet.</summary>
-        <remarks>
-          <para />
-        </remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="TV">
-      <MemberSignature Language="C#" Value="public const string TV;" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal string TV" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.DeviceInfo.Idioms.TV" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>A television.</summary>
-        <remarks>
-          <para />
-        </remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Unsupported">
-      <MemberSignature Language="C#" Value="public const string Unsupported;" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal string Unsupported" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.DeviceInfo.Idioms.Unsupported" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>Unsupported or unknown device.</summary>
-        <remarks>
-          <para />
-        </remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
diff --git a/docs/en/Xamarin.Essentials/DeviceInfo+Platforms.xml b/docs/en/Xamarin.Essentials/DeviceInfo+Platforms.xml
deleted file mode 100644
index e30398f5e..000000000
--- a/docs/en/Xamarin.Essentials/DeviceInfo+Platforms.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<Type Name="DeviceInfo+Platforms" FullName="Xamarin.Essentials.DeviceInfo+Platforms">
-  <TypeSignature Language="C#" Value="public static class DeviceInfo.Platforms" />
-  <TypeSignature Language="ILAsm" Value=".class nested public auto ansi abstract sealed beforefieldinit DeviceInfo/Platforms extends System.Object" />
-  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.DeviceInfo.Platforms" />
-  <AssemblyInfo>
-    <AssemblyName>Xamarin.Essentials</AssemblyName>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <summary>Platform operating system of the device.</summary>
-    <remarks>
-      <para />
-    </remarks>
-  </Docs>
-  <Members>
-    <Member MemberName="Android">
-      <MemberSignature Language="C#" Value="public const string Android;" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal string Android" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.DeviceInfo.Platforms.Android" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>The Android operating system.</summary>
-        <remarks>
-          <para />
-        </remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="iOS">
-      <MemberSignature Language="C#" Value="public const string iOS;" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal string iOS" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.DeviceInfo.Platforms.iOS" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>The iOS operating system.</summary>
-        <remarks>
-          <para />
-        </remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Unsupported">
-      <MemberSignature Language="C#" Value="public const string Unsupported;" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal string Unsupported" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.DeviceInfo.Platforms.Unsupported" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>An unknown or unsupported operating system.</summary>
-        <remarks>
-          <para />
-        </remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="UWP">
-      <MemberSignature Language="C#" Value="public const string UWP;" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal string UWP" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.DeviceInfo.Platforms.UWP" />
-      <MemberType>Field</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>Universal Windows Platform.</summary>
-        <remarks>
-          <para />
-        </remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
diff --git a/docs/en/Xamarin.Essentials/DeviceInfo.xml b/docs/en/Xamarin.Essentials/DeviceInfo.xml
index 4163a7cf9..8ff77191f 100644
--- a/docs/en/Xamarin.Essentials/DeviceInfo.xml
+++ b/docs/en/Xamarin.Essentials/DeviceInfo.xml
@@ -13,7 +13,7 @@
   <Docs>
     <summary>Represents information about the device.</summary>
     <remarks>
-      <para />
+      <para></para>
     </remarks>
   </Docs>
   <Members>
@@ -38,8 +38,8 @@
       </Docs>
     </Member>
     <Member MemberName="Idiom">
-      <MemberSignature Language="C#" Value="public static string Idiom { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property string Idiom" />
+      <MemberSignature Language="C#" Value="public static Xamarin.Essentials.DeviceIdiom Idiom { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property valuetype Xamarin.Essentials.DeviceIdiom Idiom" />
       <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.DeviceInfo.Idiom" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
@@ -47,7 +47,7 @@
         <AssemblyName>Xamarin.Essentials</AssemblyName>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>System.String</ReturnType>
+        <ReturnType>Xamarin.Essentials.DeviceIdiom</ReturnType>
       </ReturnValue>
       <Docs>
         <summary>Gets the idiom of the device. </summary>
@@ -118,8 +118,8 @@
       </Docs>
     </Member>
     <Member MemberName="Platform">
-      <MemberSignature Language="C#" Value="public static string Platform { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property string Platform" />
+      <MemberSignature Language="C#" Value="public static Xamarin.Essentials.DevicePlatform Platform { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property valuetype Xamarin.Essentials.DevicePlatform Platform" />
       <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.DeviceInfo.Platform" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
@@ -127,7 +127,7 @@
         <AssemblyName>Xamarin.Essentials</AssemblyName>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>System.String</ReturnType>
+        <ReturnType>Xamarin.Essentials.DevicePlatform</ReturnType>
       </ReturnValue>
       <Docs>
         <summary>Gets the platform or operating system of the device.</summary>
diff --git a/docs/en/Xamarin.Essentials/DevicePlatform.xml b/docs/en/Xamarin.Essentials/DevicePlatform.xml
new file mode 100644
index 000000000..dc579c983
--- /dev/null
+++ b/docs/en/Xamarin.Essentials/DevicePlatform.xml
@@ -0,0 +1,257 @@
+<Type Name="DevicePlatform" FullName="Xamarin.Essentials.DevicePlatform">
+  <TypeSignature Language="C#" Value="public struct DevicePlatform : IEquatable&lt;Xamarin.Essentials.DevicePlatform&gt;" />
+  <TypeSignature Language="ILAsm" Value=".class public sequential ansi sealed beforefieldinit DevicePlatform extends System.ValueType implements class System.IEquatable`1&lt;valuetype Xamarin.Essentials.DevicePlatform&gt;" />
+  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.DevicePlatform" />
+  <AssemblyInfo>
+    <AssemblyName>Xamarin.Essentials</AssemblyName>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+  </AssemblyInfo>
+  <Base>
+    <BaseTypeName>System.ValueType</BaseTypeName>
+  </Base>
+  <Interfaces>
+    <Interface>
+      <InterfaceName>System.IEquatable&lt;Xamarin.Essentials.DevicePlatform&gt;</InterfaceName>
+    </Interface>
+  </Interfaces>
+  <Attributes>
+    <Attribute FrameworkAlternate="xamarin-essentials-android;xamarin-essentials-ios;xamarin-essentials-uwp">
+      <AttributeName>System.Runtime.CompilerServices.IsReadOnly</AttributeName>
+    </Attribute>
+  </Attributes>
+  <Docs>
+    <summary>The device platform that the application is running on.</summary>
+    <remarks>
+      <para></para>
+    </remarks>
+  </Docs>
+  <Members>
+    <Member MemberName="Android">
+      <MemberSignature Language="C#" Value="public static Xamarin.Essentials.DevicePlatform Android { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property valuetype Xamarin.Essentials.DevicePlatform Android" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.DevicePlatform.Android" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Xamarin.Essentials.DevicePlatform</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Gets the Android platform.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Create">
+      <MemberSignature Language="C#" Value="public static Xamarin.Essentials.DevicePlatform Create (string deviceIdiom);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig valuetype Xamarin.Essentials.DevicePlatform Create(string deviceIdiom) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DevicePlatform.Create(System.String)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Xamarin.Essentials.DevicePlatform</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="deviceIdiom" Type="System.String" />
+      </Parameters>
+      <Docs>
+        <param name="deviceIdiom">To be added.</param>
+        <summary>Creates a new Device Platform.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Equals">
+      <MemberSignature Language="C#" Value="public override bool Equals (object obj);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance bool Equals(object obj) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DevicePlatform.Equals(System.Object)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="obj" Type="System.Object" />
+      </Parameters>
+      <Docs>
+        <param name="obj">To be added.</param>
+        <summary>Checks the equality of the platform.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Equals">
+      <MemberSignature Language="C#" Value="public bool Equals (Xamarin.Essentials.DevicePlatform other);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance bool Equals(valuetype Xamarin.Essentials.DevicePlatform other) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DevicePlatform.Equals(Xamarin.Essentials.DevicePlatform)" />
+      <MemberType>Method</MemberType>
+      <Implements>
+        <InterfaceMember>M:System.IEquatable`1.Equals(`0)</InterfaceMember>
+      </Implements>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="other" Type="Xamarin.Essentials.DevicePlatform" />
+      </Parameters>
+      <Docs>
+        <param name="other">To be added.</param>
+        <summary>Checks the equality of the platform.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="GetHashCode">
+      <MemberSignature Language="C#" Value="public override int GetHashCode ();" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance int32 GetHashCode() cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DevicePlatform.GetHashCode" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Int32</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>Gets the hash code of the platform.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="iOS">
+      <MemberSignature Language="C#" Value="public static Xamarin.Essentials.DevicePlatform iOS { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property valuetype Xamarin.Essentials.DevicePlatform iOS" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.DevicePlatform.iOS" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Xamarin.Essentials.DevicePlatform</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Gets the iOS platform.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="op_Equality">
+      <MemberSignature Language="C#" Value="public static bool operator == (Xamarin.Essentials.DevicePlatform left, Xamarin.Essentials.DevicePlatform right);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig specialname bool op_Equality(valuetype Xamarin.Essentials.DevicePlatform left, valuetype Xamarin.Essentials.DevicePlatform right) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DevicePlatform.op_Equality(Xamarin.Essentials.DevicePlatform,Xamarin.Essentials.DevicePlatform)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="left" Type="Xamarin.Essentials.DevicePlatform" />
+        <Parameter Name="right" Type="Xamarin.Essentials.DevicePlatform" />
+      </Parameters>
+      <Docs>
+        <param name="left">To be added.</param>
+        <param name="right">To be added.</param>
+        <summary>Checks the equality of the platform.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="op_Inequality">
+      <MemberSignature Language="C#" Value="public static bool operator != (Xamarin.Essentials.DevicePlatform left, Xamarin.Essentials.DevicePlatform right);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig specialname bool op_Inequality(valuetype Xamarin.Essentials.DevicePlatform left, valuetype Xamarin.Essentials.DevicePlatform right) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DevicePlatform.op_Inequality(Xamarin.Essentials.DevicePlatform,Xamarin.Essentials.DevicePlatform)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="left" Type="Xamarin.Essentials.DevicePlatform" />
+        <Parameter Name="right" Type="Xamarin.Essentials.DevicePlatform" />
+      </Parameters>
+      <Docs>
+        <param name="left">To be added.</param>
+        <param name="right">To be added.</param>
+        <summary>Checks the equality of the platform.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="ToString">
+      <MemberSignature Language="C#" Value="public override string ToString ();" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance string ToString() cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DevicePlatform.ToString" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.String</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>The string representation of the platform.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Unknown">
+      <MemberSignature Language="C#" Value="public static Xamarin.Essentials.DevicePlatform Unknown { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property valuetype Xamarin.Essentials.DevicePlatform Unknown" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.DevicePlatform.Unknown" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Xamarin.Essentials.DevicePlatform</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Gets the unknown platform.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="UWP">
+      <MemberSignature Language="C#" Value="public static Xamarin.Essentials.DevicePlatform UWP { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property valuetype Xamarin.Essentials.DevicePlatform UWP" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.DevicePlatform.UWP" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Xamarin.Essentials.DevicePlatform</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Gets the UWP platform.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+  </Members>
+</Type>
diff --git a/docs/en/index.xml b/docs/en/index.xml
index 59471ddc9..31c06e8f8 100644
--- a/docs/en/index.xml
+++ b/docs/en/index.xml
@@ -108,9 +108,9 @@
       <Type Name="Connectivity" Kind="Class" />
       <Type Name="ConnectivityChangedEventArgs" Kind="Class" />
       <Type Name="DeviceDisplay" Kind="Class" />
+      <Type Name="DeviceIdiom" Kind="Structure" />
       <Type Name="DeviceInfo" Kind="Class" />
-      <Type Name="DeviceInfo+Idioms" Kind="Class" />
-      <Type Name="DeviceInfo+Platforms" Kind="Class" />
+      <Type Name="DevicePlatform" Kind="Structure" />
       <Type Name="DeviceType" Kind="Enumeration" />
       <Type Name="DistanceUnits" Kind="Enumeration" />
       <Type Name="Email" Kind="Class" />

From 2d55930aa6f65dd776e5b74110ca27d6bb66a4df Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sat, 3 Nov 2018 02:59:25 +0200
Subject: [PATCH 20/43] Updated the docs and added a .gitattributes to control
 the line endings

---
 .../Types/DevicePlatform.shared.cs            | 26 +++++++++----------
 docs/.gitattributes                           |  2 ++
 docs/en/Xamarin.Essentials/DevicePlatform.xml |  8 +++---
 docs/en/index.xml                             |  2 +-
 4 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 docs/.gitattributes

diff --git a/Xamarin.Essentials/Types/DevicePlatform.shared.cs b/Xamarin.Essentials/Types/DevicePlatform.shared.cs
index 7d38c767b..230e2a7fa 100644
--- a/Xamarin.Essentials/Types/DevicePlatform.shared.cs
+++ b/Xamarin.Essentials/Types/DevicePlatform.shared.cs
@@ -4,7 +4,7 @@ namespace Xamarin.Essentials
 {
     public readonly struct DevicePlatform : IEquatable<DevicePlatform>
     {
-        readonly string deviceIdiom;
+        readonly string devicePlatform;
 
         public static DevicePlatform Android { get; } = new DevicePlatform(nameof(Android));
 
@@ -14,34 +14,34 @@ namespace Xamarin.Essentials
 
         public static DevicePlatform Unknown { get; } = new DevicePlatform(nameof(Unknown));
 
-        DevicePlatform(string deviceIdiom)
+        DevicePlatform(string devicePlatform)
         {
-            if (deviceIdiom == null)
-                throw new ArgumentNullException(nameof(deviceIdiom));
+            if (devicePlatform == null)
+                throw new ArgumentNullException(nameof(devicePlatform));
 
-            if (deviceIdiom.Length == 0)
-                throw new ArgumentException(nameof(deviceIdiom));
+            if (devicePlatform.Length == 0)
+                throw new ArgumentException(nameof(devicePlatform));
 
-            this.deviceIdiom = deviceIdiom;
+            this.devicePlatform = devicePlatform;
         }
 
-        public static DevicePlatform Create(string deviceIdiom) =>
-            new DevicePlatform(deviceIdiom);
+        public static DevicePlatform Create(string devicePlatform) =>
+            new DevicePlatform(devicePlatform);
 
         public bool Equals(DevicePlatform other) =>
-            Equals(other.deviceIdiom);
+            Equals(other.devicePlatform);
 
         internal bool Equals(string other) =>
-            string.Equals(deviceIdiom, other, StringComparison.Ordinal);
+            string.Equals(devicePlatform, other, StringComparison.Ordinal);
 
         public override bool Equals(object obj) =>
             obj is DevicePlatform && Equals((DevicePlatform)obj);
 
         public override int GetHashCode() =>
-            deviceIdiom == null ? 0 : deviceIdiom.GetHashCode();
+            devicePlatform == null ? 0 : devicePlatform.GetHashCode();
 
         public override string ToString() =>
-            deviceIdiom ?? string.Empty;
+            devicePlatform ?? string.Empty;
 
         public static bool operator ==(DevicePlatform left, DevicePlatform right) =>
             left.Equals(right);
diff --git a/docs/.gitattributes b/docs/.gitattributes
new file mode 100644
index 000000000..98798e4a6
--- /dev/null
+++ b/docs/.gitattributes
@@ -0,0 +1,2 @@
+# a special case for docs
+*.xml text eol=lf
\ No newline at end of file
diff --git a/docs/en/Xamarin.Essentials/DevicePlatform.xml b/docs/en/Xamarin.Essentials/DevicePlatform.xml
index dc579c983..56431e8f5 100644
--- a/docs/en/Xamarin.Essentials/DevicePlatform.xml
+++ b/docs/en/Xamarin.Essentials/DevicePlatform.xml
@@ -45,8 +45,8 @@
       </Docs>
     </Member>
     <Member MemberName="Create">
-      <MemberSignature Language="C#" Value="public static Xamarin.Essentials.DevicePlatform Create (string deviceIdiom);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig valuetype Xamarin.Essentials.DevicePlatform Create(string deviceIdiom) cil managed" />
+      <MemberSignature Language="C#" Value="public static Xamarin.Essentials.DevicePlatform Create (string devicePlatform);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig valuetype Xamarin.Essentials.DevicePlatform Create(string devicePlatform) cil managed" />
       <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DevicePlatform.Create(System.String)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
@@ -57,10 +57,10 @@
         <ReturnType>Xamarin.Essentials.DevicePlatform</ReturnType>
       </ReturnValue>
       <Parameters>
-        <Parameter Name="deviceIdiom" Type="System.String" />
+        <Parameter Name="devicePlatform" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="deviceIdiom">To be added.</param>
+        <param name="devicePlatform">To be added.</param>
         <summary>Creates a new Device Platform.</summary>
         <returns>To be added.</returns>
         <remarks>To be added.</remarks>
diff --git a/docs/en/index.xml b/docs/en/index.xml
index a5159c45f..7f00b0eb9 100644
--- a/docs/en/index.xml
+++ b/docs/en/index.xml
@@ -78,7 +78,7 @@
           <AttributeName>System.Runtime.Versioning.TargetFramework(".NETCore,Version=v5.0", FrameworkDisplayName=".NET for Windows Universal")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyInformationalVersion("1.0.0+f24a7f28f47f83f1d82dd3de8a218b5080615dee")</AttributeName>
+          <AttributeName>System.Reflection.AssemblyInformationalVersion("1.0.0+c2fdf1b17d8b6418ae8fd474dbc21ec709d8b0f7")</AttributeName>
         </Attribute>
       </Attributes>
     </Assembly>

From 3a5ecb7cff98934d6e5b30a51c63375b0e32d2dc Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sun, 4 Nov 2018 01:26:50 +0200
Subject: [PATCH 21/43] Renamed SpeakSettings to SpeechOptions. Closes #580

---
 Samples/Samples/View/TextToSpeechPage.xaml    | 18 +++++++-------
 .../ViewModel/TextToSpeechViewModel.cs        | 24 +++++++++----------
 .../TextToSpeech/TextToSpeech.android.cs      | 22 ++++++++---------
 .../TextToSpeech/TextToSpeech.ios.cs          | 18 +++++++-------
 .../TextToSpeech/TextToSpeech.netstandard.cs  |  2 +-
 .../TextToSpeech/TextToSpeech.shared.cs       | 14 +++++------
 .../TextToSpeech/TextToSpeech.uwp.cs          | 20 ++++++++--------
 .../xamarin-essentials-android.xml            | 12 +++++-----
 .../xamarin-essentials-ios.xml                | 12 +++++-----
 .../xamarin-essentials-uwp.xml                | 12 +++++-----
 .../en/FrameworksIndex/xamarin-essentials.xml | 12 +++++-----
 .../{SpeakSettings.xml => SpeechOptions.xml}  | 20 ++++++++--------
 docs/en/Xamarin.Essentials/TextToSpeech.xml   | 14 +++++------
 docs/en/index.xml                             |  4 ++--
 14 files changed, 102 insertions(+), 102 deletions(-)
 rename docs/en/Xamarin.Essentials/{SpeakSettings.xml => SpeechOptions.xml} (88%)

diff --git a/Samples/Samples/View/TextToSpeechPage.xaml b/Samples/Samples/View/TextToSpeechPage.xaml
index f2933aa5b..744b46087 100644
--- a/Samples/Samples/View/TextToSpeechPage.xaml
+++ b/Samples/Samples/View/TextToSpeechPage.xaml
@@ -24,18 +24,18 @@
                 <Switch HorizontalOptions="Center" x:Name="SwitchMultiple"/>
 
                 <Label Text="Advanced" HorizontalOptions="Start" />
-                <Switch HorizontalOptions="Center" IsToggled="{Binding AdvancedSettings}"/>
+                <Switch HorizontalOptions="Center" IsToggled="{Binding AdvancedOptions}"/>
 
-                <Label Text="Volume" HorizontalOptions="Start"  IsVisible="{Binding AdvancedSettings}"/>
-                <Label Text="{Binding Volume}" HorizontalOptions="Center"  IsVisible="{Binding AdvancedSettings}"/>
-                <Slider Value="{Binding Volume}" Minimum="0.0" Maximum="1.0" IsVisible="{Binding AdvancedSettings}"/>
+                <Label Text="Volume" HorizontalOptions="Start"  IsVisible="{Binding AdvancedOptions}"/>
+                <Label Text="{Binding Volume}" HorizontalOptions="Center"  IsVisible="{Binding AdvancedOptions}"/>
+                <Slider Value="{Binding Volume}" Minimum="0.0" Maximum="1.0" IsVisible="{Binding AdvancedOptions}"/>
 
-                <Label Text="Pitch" HorizontalOptions="Start"  IsVisible="{Binding AdvancedSettings}"/>
-                <Label Text="{Binding Pitch}" HorizontalOptions="Center"  IsVisible="{Binding AdvancedSettings}"/>
-                <Slider Value="{Binding Pitch}" Minimum="0.0" Maximum="2.0" IsVisible="{Binding AdvancedSettings}"/>
+                <Label Text="Pitch" HorizontalOptions="Start"  IsVisible="{Binding AdvancedOptions}"/>
+                <Label Text="{Binding Pitch}" HorizontalOptions="Center"  IsVisible="{Binding AdvancedOptions}"/>
+                <Slider Value="{Binding Pitch}" Minimum="0.0" Maximum="2.0" IsVisible="{Binding AdvancedOptions}"/>
 
-                <Button Text="Pick Locale" Command="{Binding PickLocaleCommand}" IsVisible="{Binding AdvancedSettings}"/>
-                <Label Text="{Binding Locale}" IsVisible="{Binding AdvancedSettings}"/>
+                <Button Text="Pick Locale" Command="{Binding PickLocaleCommand}" IsVisible="{Binding AdvancedOptions}"/>
+                <Label Text="{Binding Locale}" IsVisible="{Binding AdvancedOptions}"/>
                 
                 <ActivityIndicator IsVisible="{Binding IsBusy}" IsRunning="{Binding IsBusy}" />
             </StackLayout>
diff --git a/Samples/Samples/ViewModel/TextToSpeechViewModel.cs b/Samples/Samples/ViewModel/TextToSpeechViewModel.cs
index 13a3227ed..7e66f3603 100644
--- a/Samples/Samples/ViewModel/TextToSpeechViewModel.cs
+++ b/Samples/Samples/ViewModel/TextToSpeechViewModel.cs
@@ -12,7 +12,7 @@ public class TextToSpeechViewModel : BaseViewModel
         CancellationTokenSource cts;
 
         string text;
-        bool advancedSettings;
+        bool advancedOptions;
         float volume;
         float pitch;
         string locale = "Default";
@@ -26,7 +26,7 @@ public TextToSpeechViewModel()
 
             Text = "Xamarin Essentials makes text to speech easy!";
 
-            AdvancedSettings = false;
+            AdvancedOptions = false;
             Volume = 1.0f;
             Pitch = 1.0f;
         }
@@ -47,10 +47,10 @@ void OnSpeak(bool multiple)
 
             cts = new CancellationTokenSource();
 
-            SpeakSettings settings = null;
-            if (AdvancedSettings)
+            SpeechOptions options = null;
+            if (AdvancedOptions)
             {
-                settings = new SpeakSettings
+                options = new SpeechOptions
                 {
                     Volume = Volume,
                     Pitch = Pitch,
@@ -62,13 +62,13 @@ void OnSpeak(bool multiple)
             if (multiple)
             {
                 speaks = Task.WhenAll(
-                    TextToSpeech.SpeakAsync(Text + " 1 ", settings, cancelToken: cts.Token),
-                    TextToSpeech.SpeakAsync(Text + " 2 ", settings, cancelToken: cts.Token),
-                    TextToSpeech.SpeakAsync(Text + " 3 ", settings, cancelToken: cts.Token));
+                    TextToSpeech.SpeakAsync(Text + " 1 ", options, cancelToken: cts.Token),
+                    TextToSpeech.SpeakAsync(Text + " 2 ", options, cancelToken: cts.Token),
+                    TextToSpeech.SpeakAsync(Text + " 3 ", options, cancelToken: cts.Token));
             }
             else
             {
-                speaks = TextToSpeech.SpeakAsync(Text, settings, cts.Token);
+                speaks = TextToSpeech.SpeakAsync(Text, options, cts.Token);
             }
 
             // use ContinueWith so we don't have to catch the cancelled exceptions
@@ -108,10 +108,10 @@ public string Text
             set => SetProperty(ref text, value);
         }
 
-        public bool AdvancedSettings
+        public bool AdvancedOptions
         {
-            get => advancedSettings;
-            set => SetProperty(ref advancedSettings, value);
+            get => advancedOptions;
+            set => SetProperty(ref advancedOptions, value);
         }
 
         public float Volume
diff --git a/Xamarin.Essentials/TextToSpeech/TextToSpeech.android.cs b/Xamarin.Essentials/TextToSpeech/TextToSpeech.android.cs
index dcb75e45f..cce3d684c 100644
--- a/Xamarin.Essentials/TextToSpeech/TextToSpeech.android.cs
+++ b/Xamarin.Essentials/TextToSpeech/TextToSpeech.android.cs
@@ -29,7 +29,7 @@ static TextToSpeechImplementation GetTextToSpeech()
             return tts;
         }
 
-        internal static Task PlatformSpeakAsync(string text, SpeakSettings settings, CancellationToken cancelToken = default)
+        internal static Task PlatformSpeakAsync(string text, SpeechOptions options, CancellationToken cancelToken = default)
         {
             var textToSpeech = GetTextToSpeech();
 
@@ -40,7 +40,7 @@ internal static Task PlatformSpeakAsync(string text, SpeakSettings settings, Can
             if (Platform.HasApiLevel(BuildVersionCodes.JellyBeanMr2))
                 max = AndroidTextToSpeech.MaxSpeechInputLength;
 
-            return textToSpeech.SpeakAsync(text, max, settings, cancelToken);
+            return textToSpeech.SpeakAsync(text, max, options, cancelToken);
         }
 
         internal static Task<IEnumerable<Locale>> PlatformGetLocalesAsync()
@@ -101,7 +101,7 @@ protected override void Dispose(bool disposing)
         int numExpectedUtterances = 0;
         int numCompletedUtterances = 0;
 
-        public async Task SpeakAsync(string text, int max, SpeakSettings settings, CancellationToken cancelToken)
+        public async Task SpeakAsync(string text, int max, SpeechOptions options, CancellationToken cancelToken)
         {
             await Initialize();
 
@@ -125,13 +125,13 @@ public async Task SpeakAsync(string text, int max, SpeakSettings settings, Cance
                 });
             }
 
-            if (settings?.Locale?.Language != null)
+            if (options?.Locale?.Language != null)
             {
                 JavaLocale locale = null;
-                if (!string.IsNullOrWhiteSpace(settings?.Locale.Country))
-                    locale = new JavaLocale(settings.Locale.Language, settings.Locale.Country);
+                if (!string.IsNullOrWhiteSpace(options?.Locale.Country))
+                    locale = new JavaLocale(options.Locale.Language, options.Locale.Country);
                 else
-                    locale = new JavaLocale(settings.Locale.Language);
+                    locale = new JavaLocale(options.Locale.Language);
 
                 tts.SetLanguage(locale);
             }
@@ -140,8 +140,8 @@ public async Task SpeakAsync(string text, int max, SpeakSettings settings, Cance
                 SetDefaultLanguage();
             }
 
-            if (settings?.Pitch.HasValue ?? false)
-                tts.SetPitch(settings.Pitch.Value);
+            if (options?.Pitch.HasValue ?? false)
+                tts.SetPitch(options.Pitch.Value);
             else
                 tts.SetPitch(TextToSpeech.PitchDefault);
 
@@ -160,8 +160,8 @@ public async Task SpeakAsync(string text, int max, SpeakSettings settings, Cance
                     { AndroidTextToSpeech.Engine.KeyParamUtteranceId, $"{guid}.{i}" }
                 };
 
-                if (settings != null && settings.Volume.HasValue)
-                    map.Add(AndroidTextToSpeech.Engine.KeyParamVolume, settings.Volume.Value.ToString(CultureInfo.InvariantCulture));
+                if (options != null && options.Volume.HasValue)
+                    map.Add(AndroidTextToSpeech.Engine.KeyParamVolume, options.Volume.Value.ToString(CultureInfo.InvariantCulture));
 
                 // We use an obsolete overload here so it works on older API levels at runtime
                 // Flush on first entry and add (to not flush our own previous) subsequent entries
diff --git a/Xamarin.Essentials/TextToSpeech/TextToSpeech.ios.cs b/Xamarin.Essentials/TextToSpeech/TextToSpeech.ios.cs
index 9cd2029ed..fbe76b9ab 100644
--- a/Xamarin.Essentials/TextToSpeech/TextToSpeech.ios.cs
+++ b/Xamarin.Essentials/TextToSpeech/TextToSpeech.ios.cs
@@ -12,30 +12,30 @@ internal static Task<IEnumerable<Locale>> PlatformGetLocalesAsync() =>
             Task.FromResult(AVSpeechSynthesisVoice.GetSpeechVoices()
                 .Select(v => new Locale(v.Language, null, v.Language, v.Identifier)));
 
-        internal static Task PlatformSpeakAsync(string text, SpeakSettings settings, CancellationToken cancelToken = default)
+        internal static Task PlatformSpeakAsync(string text, SpeechOptions options, CancellationToken cancelToken = default)
         {
-            var speechUtterance = GetSpeechUtterance(text, settings);
+            var speechUtterance = GetSpeechUtterance(text, options);
             return SpeakUtterance(speechUtterance, cancelToken);
         }
 
-        private static AVSpeechUtterance GetSpeechUtterance(string text, SpeakSettings settings)
+        private static AVSpeechUtterance GetSpeechUtterance(string text, SpeechOptions options)
         {
             var speechUtterance = new AVSpeechUtterance(text);
 
-            if (settings != null)
+            if (options != null)
             {
                 // null voice if fine - it is the default
                 speechUtterance.Voice =
-                    AVSpeechSynthesisVoice.FromLanguage(settings.Locale?.Language) ??
+                    AVSpeechSynthesisVoice.FromLanguage(options.Locale?.Language) ??
                     AVSpeechSynthesisVoice.FromLanguage(AVSpeechSynthesisVoice.CurrentLanguageCode);
 
                 // the platform has a range of 0.5 - 2.0
                 // anything lower than 0.5 is set to 0.5
-                if (settings.Pitch.HasValue)
-                    speechUtterance.PitchMultiplier = settings.Pitch.Value;
+                if (options.Pitch.HasValue)
+                    speechUtterance.PitchMultiplier = options.Pitch.Value;
 
-                if (settings.Volume.HasValue)
-                    speechUtterance.Volume = settings.Volume.Value;
+                if (options.Volume.HasValue)
+                    speechUtterance.Volume = options.Volume.Value;
             }
 
             return speechUtterance;
diff --git a/Xamarin.Essentials/TextToSpeech/TextToSpeech.netstandard.cs b/Xamarin.Essentials/TextToSpeech/TextToSpeech.netstandard.cs
index 38524b180..36ccf9fb9 100644
--- a/Xamarin.Essentials/TextToSpeech/TextToSpeech.netstandard.cs
+++ b/Xamarin.Essentials/TextToSpeech/TextToSpeech.netstandard.cs
@@ -6,7 +6,7 @@ namespace Xamarin.Essentials
 {
     public static partial class TextToSpeech
     {
-        internal static Task PlatformSpeakAsync(string text, SpeakSettings settings, CancellationToken cancelToken = default) =>
+        internal static Task PlatformSpeakAsync(string text, SpeechOptions options, CancellationToken cancelToken = default) =>
             throw new NotImplementedInReferenceAssemblyException();
 
         internal static Task<IEnumerable<Locale>> PlatformGetLocalesAsync() =>
diff --git a/Xamarin.Essentials/TextToSpeech/TextToSpeech.shared.cs b/Xamarin.Essentials/TextToSpeech/TextToSpeech.shared.cs
index 3cb745e79..9219fd720 100644
--- a/Xamarin.Essentials/TextToSpeech/TextToSpeech.shared.cs
+++ b/Xamarin.Essentials/TextToSpeech/TextToSpeech.shared.cs
@@ -23,20 +23,20 @@ public static Task<IEnumerable<Locale>> GetLocalesAsync() =>
         public static Task SpeakAsync(string text, CancellationToken cancelToken = default) =>
             SpeakAsync(text, default, cancelToken);
 
-        public static async Task SpeakAsync(string text, SpeakSettings settings, CancellationToken cancelToken = default)
+        public static async Task SpeakAsync(string text, SpeechOptions options, CancellationToken cancelToken = default)
         {
             if (string.IsNullOrEmpty(text))
                 throw new ArgumentNullException(nameof(text), "Text cannot be null or empty string");
 
-            if (settings?.Volume.HasValue ?? false)
+            if (options?.Volume.HasValue ?? false)
             {
-                if (settings.Volume.Value < VolumeMin || settings.Volume.Value > VolumeMax)
+                if (options.Volume.Value < VolumeMin || options.Volume.Value > VolumeMax)
                     throw new ArgumentOutOfRangeException($"Volume must be >= {VolumeMin} and <= {VolumeMax}");
             }
 
-            if (settings?.Pitch.HasValue ?? false)
+            if (options?.Pitch.HasValue ?? false)
             {
-                if (settings.Pitch.Value < PitchMin || settings.Pitch.Value > PitchMax)
+                if (options.Pitch.Value < PitchMin || options.Pitch.Value > PitchMax)
                     throw new ArgumentOutOfRangeException($"Pitch must be >= {PitchMin} and <= {PitchMin}");
             }
 
@@ -46,7 +46,7 @@ public static async Task SpeakAsync(string text, SpeakSettings settings, Cancell
             try
             {
                 await semaphore.WaitAsync(cancelToken);
-                await PlatformSpeakAsync(text, settings, cancelToken);
+                await PlatformSpeakAsync(text, options, cancelToken);
             }
             finally
             {
@@ -82,7 +82,7 @@ internal Locale(string language, string country, string name, string id)
         }
     }
 
-    public class SpeakSettings
+    public class SpeechOptions
     {
         public Locale Locale { get; set; }
 
diff --git a/Xamarin.Essentials/TextToSpeech/TextToSpeech.uwp.cs b/Xamarin.Essentials/TextToSpeech/TextToSpeech.uwp.cs
index e2228a710..dd8e21677 100644
--- a/Xamarin.Essentials/TextToSpeech/TextToSpeech.uwp.cs
+++ b/Xamarin.Essentials/TextToSpeech/TextToSpeech.uwp.cs
@@ -17,7 +17,7 @@ public static partial class TextToSpeech
         internal static Task<IEnumerable<Locale>> PlatformGetLocalesAsync() =>
             Task.FromResult(SpeechSynthesizer.AllVoices.Select(v => new Locale(v.Language, null, v.DisplayName, v.Id)));
 
-        internal static async Task PlatformSpeakAsync(string text, SpeakSettings settings, CancellationToken cancelToken = default)
+        internal static async Task PlatformSpeakAsync(string text, SpeechOptions options, CancellationToken cancelToken = default)
         {
             var tcsUtterance = new TaskCompletionSource<bool>();
 
@@ -25,13 +25,13 @@ internal static async Task PlatformSpeakAsync(string text, SpeakSettings setting
             {
                 var player = new MediaPlayer();
 
-                var ssml = GetSpeakParametersSSMLProsody(text, settings);
+                var ssml = GetSpeakParametersSSMLProsody(text, options);
 
                 var speechSynthesizer = new SpeechSynthesizer();
 
-                if (!string.IsNullOrWhiteSpace(settings?.Locale?.Id))
+                if (!string.IsNullOrWhiteSpace(options?.Locale?.Id))
                 {
-                    var voiceInfo = SpeechSynthesizer.AllVoices.FirstOrDefault(v => v.Id == settings.Locale.Id) ?? SpeechSynthesizer.DefaultVoice;
+                    var voiceInfo = SpeechSynthesizer.AllVoices.FirstOrDefault(v => v.Id == options.Locale.Id) ?? SpeechSynthesizer.DefaultVoice;
                     speechSynthesizer.Voice = voiceInfo;
                 }
 
@@ -67,20 +67,20 @@ void PlayerMediaEnded(MediaPlayer sender, object args)
             }
         }
 
-        static string GetSpeakParametersSSMLProsody(string text, SpeakSettings settings)
+        static string GetSpeakParametersSSMLProsody(string text, SpeechOptions options)
         {
             var volume = "default";
             var pitch = "default";
             var rate = "default";
 
             // Look for the specified language, otherwise the default voice
-            var locale = settings?.Locale?.Language ?? SpeechSynthesizer.DefaultVoice.Language;
+            var locale = options?.Locale?.Language ?? SpeechSynthesizer.DefaultVoice.Language;
 
-            if (settings?.Volume.HasValue ?? false)
-                volume = (settings.Volume.Value * 100f).ToString(CultureInfo.InvariantCulture);
+            if (options?.Volume.HasValue ?? false)
+                volume = (options.Volume.Value * 100f).ToString(CultureInfo.InvariantCulture);
 
-            if (settings?.Pitch.HasValue ?? false)
-                pitch = ProsodyPitch(settings.Pitch);
+            if (options?.Pitch.HasValue ?? false)
+                pitch = ProsodyPitch(options.Pitch);
 
             // SSML generation
             var ssml = new StringBuilder();
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-android.xml b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
index 61e401388..cba063834 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-android.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
@@ -514,16 +514,16 @@
       <Member Id="P:Xamarin.Essentials.SmsMessage.Body" />
       <Member Id="P:Xamarin.Essentials.SmsMessage.Recipients" />
     </Type>
-    <Type Name="Xamarin.Essentials.SpeakSettings" Id="T:Xamarin.Essentials.SpeakSettings">
-      <Member Id="M:Xamarin.Essentials.SpeakSettings.#ctor" />
-      <Member Id="P:Xamarin.Essentials.SpeakSettings.Locale" />
-      <Member Id="P:Xamarin.Essentials.SpeakSettings.Pitch" />
-      <Member Id="P:Xamarin.Essentials.SpeakSettings.Volume" />
+    <Type Name="Xamarin.Essentials.SpeechOptions" Id="T:Xamarin.Essentials.SpeechOptions">
+      <Member Id="M:Xamarin.Essentials.SpeechOptions.#ctor" />
+      <Member Id="P:Xamarin.Essentials.SpeechOptions.Locale" />
+      <Member Id="P:Xamarin.Essentials.SpeechOptions.Pitch" />
+      <Member Id="P:Xamarin.Essentials.SpeechOptions.Volume" />
     </Type>
     <Type Name="Xamarin.Essentials.TextToSpeech" Id="T:Xamarin.Essentials.TextToSpeech">
       <Member Id="M:Xamarin.Essentials.TextToSpeech.GetLocalesAsync" />
       <Member Id="M:Xamarin.Essentials.TextToSpeech.SpeakAsync(System.String,System.Threading.CancellationToken)" />
-      <Member Id="M:Xamarin.Essentials.TextToSpeech.SpeakAsync(System.String,Xamarin.Essentials.SpeakSettings,System.Threading.CancellationToken)" />
+      <Member Id="M:Xamarin.Essentials.TextToSpeech.SpeakAsync(System.String,Xamarin.Essentials.SpeechOptions,System.Threading.CancellationToken)" />
     </Type>
     <Type Name="Xamarin.Essentials.VersionTracking" Id="T:Xamarin.Essentials.VersionTracking">
       <Member Id="M:Xamarin.Essentials.VersionTracking.IsFirstLaunchForBuild(System.String)" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
index c55a69824..fee864320 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
@@ -513,16 +513,16 @@
       <Member Id="P:Xamarin.Essentials.SmsMessage.Body" />
       <Member Id="P:Xamarin.Essentials.SmsMessage.Recipients" />
     </Type>
-    <Type Name="Xamarin.Essentials.SpeakSettings" Id="T:Xamarin.Essentials.SpeakSettings">
-      <Member Id="M:Xamarin.Essentials.SpeakSettings.#ctor" />
-      <Member Id="P:Xamarin.Essentials.SpeakSettings.Locale" />
-      <Member Id="P:Xamarin.Essentials.SpeakSettings.Pitch" />
-      <Member Id="P:Xamarin.Essentials.SpeakSettings.Volume" />
+    <Type Name="Xamarin.Essentials.SpeechOptions" Id="T:Xamarin.Essentials.SpeechOptions">
+      <Member Id="M:Xamarin.Essentials.SpeechOptions.#ctor" />
+      <Member Id="P:Xamarin.Essentials.SpeechOptions.Locale" />
+      <Member Id="P:Xamarin.Essentials.SpeechOptions.Pitch" />
+      <Member Id="P:Xamarin.Essentials.SpeechOptions.Volume" />
     </Type>
     <Type Name="Xamarin.Essentials.TextToSpeech" Id="T:Xamarin.Essentials.TextToSpeech">
       <Member Id="M:Xamarin.Essentials.TextToSpeech.GetLocalesAsync" />
       <Member Id="M:Xamarin.Essentials.TextToSpeech.SpeakAsync(System.String,System.Threading.CancellationToken)" />
-      <Member Id="M:Xamarin.Essentials.TextToSpeech.SpeakAsync(System.String,Xamarin.Essentials.SpeakSettings,System.Threading.CancellationToken)" />
+      <Member Id="M:Xamarin.Essentials.TextToSpeech.SpeakAsync(System.String,Xamarin.Essentials.SpeechOptions,System.Threading.CancellationToken)" />
     </Type>
     <Type Name="Xamarin.Essentials.VersionTracking" Id="T:Xamarin.Essentials.VersionTracking">
       <Member Id="M:Xamarin.Essentials.VersionTracking.IsFirstLaunchForBuild(System.String)" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
index 794c5dedd..7b53146ae 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
@@ -512,16 +512,16 @@
       <Member Id="P:Xamarin.Essentials.SmsMessage.Body" />
       <Member Id="P:Xamarin.Essentials.SmsMessage.Recipients" />
     </Type>
-    <Type Name="Xamarin.Essentials.SpeakSettings" Id="T:Xamarin.Essentials.SpeakSettings">
-      <Member Id="M:Xamarin.Essentials.SpeakSettings.#ctor" />
-      <Member Id="P:Xamarin.Essentials.SpeakSettings.Locale" />
-      <Member Id="P:Xamarin.Essentials.SpeakSettings.Pitch" />
-      <Member Id="P:Xamarin.Essentials.SpeakSettings.Volume" />
+    <Type Name="Xamarin.Essentials.SpeechOptions" Id="T:Xamarin.Essentials.SpeechOptions">
+      <Member Id="M:Xamarin.Essentials.SpeechOptions.#ctor" />
+      <Member Id="P:Xamarin.Essentials.SpeechOptions.Locale" />
+      <Member Id="P:Xamarin.Essentials.SpeechOptions.Pitch" />
+      <Member Id="P:Xamarin.Essentials.SpeechOptions.Volume" />
     </Type>
     <Type Name="Xamarin.Essentials.TextToSpeech" Id="T:Xamarin.Essentials.TextToSpeech">
       <Member Id="M:Xamarin.Essentials.TextToSpeech.GetLocalesAsync" />
       <Member Id="M:Xamarin.Essentials.TextToSpeech.SpeakAsync(System.String,System.Threading.CancellationToken)" />
-      <Member Id="M:Xamarin.Essentials.TextToSpeech.SpeakAsync(System.String,Xamarin.Essentials.SpeakSettings,System.Threading.CancellationToken)" />
+      <Member Id="M:Xamarin.Essentials.TextToSpeech.SpeakAsync(System.String,Xamarin.Essentials.SpeechOptions,System.Threading.CancellationToken)" />
     </Type>
     <Type Name="Xamarin.Essentials.VersionTracking" Id="T:Xamarin.Essentials.VersionTracking">
       <Member Id="M:Xamarin.Essentials.VersionTracking.IsFirstLaunchForBuild(System.String)" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials.xml b/docs/en/FrameworksIndex/xamarin-essentials.xml
index 1c4013eaf..2b35472d9 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials.xml
@@ -509,16 +509,16 @@
       <Member Id="P:Xamarin.Essentials.SmsMessage.Body" />
       <Member Id="P:Xamarin.Essentials.SmsMessage.Recipients" />
     </Type>
-    <Type Name="Xamarin.Essentials.SpeakSettings" Id="T:Xamarin.Essentials.SpeakSettings">
-      <Member Id="M:Xamarin.Essentials.SpeakSettings.#ctor" />
-      <Member Id="P:Xamarin.Essentials.SpeakSettings.Locale" />
-      <Member Id="P:Xamarin.Essentials.SpeakSettings.Pitch" />
-      <Member Id="P:Xamarin.Essentials.SpeakSettings.Volume" />
+    <Type Name="Xamarin.Essentials.SpeechOptions" Id="T:Xamarin.Essentials.SpeechOptions">
+      <Member Id="M:Xamarin.Essentials.SpeechOptions.#ctor" />
+      <Member Id="P:Xamarin.Essentials.SpeechOptions.Locale" />
+      <Member Id="P:Xamarin.Essentials.SpeechOptions.Pitch" />
+      <Member Id="P:Xamarin.Essentials.SpeechOptions.Volume" />
     </Type>
     <Type Name="Xamarin.Essentials.TextToSpeech" Id="T:Xamarin.Essentials.TextToSpeech">
       <Member Id="M:Xamarin.Essentials.TextToSpeech.GetLocalesAsync" />
       <Member Id="M:Xamarin.Essentials.TextToSpeech.SpeakAsync(System.String,System.Threading.CancellationToken)" />
-      <Member Id="M:Xamarin.Essentials.TextToSpeech.SpeakAsync(System.String,Xamarin.Essentials.SpeakSettings,System.Threading.CancellationToken)" />
+      <Member Id="M:Xamarin.Essentials.TextToSpeech.SpeakAsync(System.String,Xamarin.Essentials.SpeechOptions,System.Threading.CancellationToken)" />
     </Type>
     <Type Name="Xamarin.Essentials.VersionTracking" Id="T:Xamarin.Essentials.VersionTracking">
       <Member Id="M:Xamarin.Essentials.VersionTracking.IsFirstLaunchForBuild(System.String)" />
diff --git a/docs/en/Xamarin.Essentials/SpeakSettings.xml b/docs/en/Xamarin.Essentials/SpeechOptions.xml
similarity index 88%
rename from docs/en/Xamarin.Essentials/SpeakSettings.xml
rename to docs/en/Xamarin.Essentials/SpeechOptions.xml
index da954c82d..406b6ba30 100644
--- a/docs/en/Xamarin.Essentials/SpeakSettings.xml
+++ b/docs/en/Xamarin.Essentials/SpeechOptions.xml
@@ -1,7 +1,7 @@
-<Type Name="SpeakSettings" FullName="Xamarin.Essentials.SpeakSettings">
-  <TypeSignature Language="C#" Value="public class SpeakSettings" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit SpeakSettings extends System.Object" />
-  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.SpeakSettings" />
+<Type Name="SpeechOptions" FullName="Xamarin.Essentials.SpeechOptions">
+  <TypeSignature Language="C#" Value="public class SpeechOptions" />
+  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit SpeechOptions extends System.Object" />
+  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.SpeechOptions" />
   <AssemblyInfo>
     <AssemblyName>Xamarin.Essentials</AssemblyName>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -11,14 +11,14 @@
   </Base>
   <Interfaces />
   <Docs>
-    <summary>Text to Speech Settings.</summary>
+    <summary>Text-to-speech options.</summary>
     <remarks></remarks>
   </Docs>
   <Members>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public SpeakSettings ();" />
+      <MemberSignature Language="C#" Value="public SpeechOptions ();" />
       <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.SpeakSettings.#ctor" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.SpeechOptions.#ctor" />
       <MemberType>Constructor</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
@@ -33,7 +33,7 @@
     <Member MemberName="Locale">
       <MemberSignature Language="C#" Value="public Xamarin.Essentials.Locale Locale { get; set; }" />
       <MemberSignature Language="ILAsm" Value=".property instance class Xamarin.Essentials.Locale Locale" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.SpeakSettings.Locale" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.SpeechOptions.Locale" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
@@ -51,7 +51,7 @@
     <Member MemberName="Pitch">
       <MemberSignature Language="C#" Value="public Nullable&lt;float&gt; Pitch { get; set; }" />
       <MemberSignature Language="ILAsm" Value=".property instance valuetype System.Nullable`1&lt;float32&gt; Pitch" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.SpeakSettings.Pitch" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.SpeechOptions.Pitch" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
@@ -69,7 +69,7 @@
     <Member MemberName="Volume">
       <MemberSignature Language="C#" Value="public Nullable&lt;float&gt; Volume { get; set; }" />
       <MemberSignature Language="ILAsm" Value=".property instance valuetype System.Nullable`1&lt;float32&gt; Volume" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.SpeakSettings.Volume" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.SpeechOptions.Volume" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
diff --git a/docs/en/Xamarin.Essentials/TextToSpeech.xml b/docs/en/Xamarin.Essentials/TextToSpeech.xml
index de17802ee..3c37b371d 100644
--- a/docs/en/Xamarin.Essentials/TextToSpeech.xml
+++ b/docs/en/Xamarin.Essentials/TextToSpeech.xml
@@ -53,15 +53,15 @@
       <Docs>
         <param name="text">The text to speak..</param>
         <param name="cancelToken">Optional cancellation token to stop speaking.</param>
-        <summary>Speaks the given text with default settings.</summary>
+        <summary>Speaks the given text with default options.</summary>
         <returns></returns>
         <remarks></remarks>
       </Docs>
     </Member>
     <Member MemberName="SpeakAsync">
-      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task SpeakAsync (string text, Xamarin.Essentials.SpeakSettings settings, System.Threading.CancellationToken cancelToken = null);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task SpeakAsync(string text, class Xamarin.Essentials.SpeakSettings settings, valuetype System.Threading.CancellationToken cancelToken) cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.TextToSpeech.SpeakAsync(System.String,Xamarin.Essentials.SpeakSettings,System.Threading.CancellationToken)" />
+      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task SpeakAsync (string text, Xamarin.Essentials.SpeechOptions options, System.Threading.CancellationToken cancelToken = null);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task SpeakAsync(string text, class Xamarin.Essentials.SpeechOptions options, valuetype System.Threading.CancellationToken cancelToken) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.TextToSpeech.SpeakAsync(System.String,Xamarin.Essentials.SpeechOptions,System.Threading.CancellationToken)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
@@ -72,14 +72,14 @@
       </ReturnValue>
       <Parameters>
         <Parameter Name="text" Type="System.String" />
-        <Parameter Name="settings" Type="Xamarin.Essentials.SpeakSettings" />
+        <Parameter Name="options" Type="Xamarin.Essentials.SpeechOptions" />
         <Parameter Name="cancelToken" Type="System.Threading.CancellationToken" />
       </Parameters>
       <Docs>
         <param name="text">The text to speak.</param>
-        <param name="settings">The settings to use for speaking.</param>
+        <param name="options">The options to use for speaking.</param>
         <param name="cancelToken">Optional cancellation token to stop speaking.</param>
-        <summary>Speaks the given text with the specified settings.</summary>
+        <summary>Speaks the given text with the specified options.</summary>
         <returns></returns>
         <remarks></remarks>
       </Docs>
diff --git a/docs/en/index.xml b/docs/en/index.xml
index 7f00b0eb9..3342399f3 100644
--- a/docs/en/index.xml
+++ b/docs/en/index.xml
@@ -78,7 +78,7 @@
           <AttributeName>System.Runtime.Versioning.TargetFramework(".NETCore,Version=v5.0", FrameworkDisplayName=".NET for Windows Universal")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyInformationalVersion("1.0.0+c2fdf1b17d8b6418ae8fd474dbc21ec709d8b0f7")</AttributeName>
+          <AttributeName>System.Reflection.AssemblyInformationalVersion("1.0.0+2d55930aa6f65dd776e5b74110ca27d6bb66a4df")</AttributeName>
         </Attribute>
       </Attributes>
     </Assembly>
@@ -162,7 +162,7 @@
       <Type Name="ShareTextRequest" Kind="Class" />
       <Type Name="Sms" Kind="Class" />
       <Type Name="SmsMessage" Kind="Class" />
-      <Type Name="SpeakSettings" Kind="Class" />
+      <Type Name="SpeechOptions" Kind="Class" />
       <Type Name="TextToSpeech" Kind="Class" />
       <Type Name="VersionTracking" Kind="Class" />
       <Type Name="Vibration" Kind="Class" />

From 06f6e2b7c393a97f6c3d4b34bb339c7a1081e993 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sun, 4 Nov 2018 01:34:05 +0200
Subject: [PATCH 22/43] Add docs about HTML emails not supported on UWP. Closes
 #578

---
 docs/en/Xamarin.Essentials/EmailBodyFormat.xml | 2 +-
 docs/en/Xamarin.Essentials/EmailMessage.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/Xamarin.Essentials/EmailBodyFormat.xml b/docs/en/Xamarin.Essentials/EmailBodyFormat.xml
index 75ad87538..bf5ef9d29 100644
--- a/docs/en/Xamarin.Essentials/EmailBodyFormat.xml
+++ b/docs/en/Xamarin.Essentials/EmailBodyFormat.xml
@@ -28,7 +28,7 @@
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>The email message body is HTML.</summary>
+        <summary>The email message body is HTML (not supported on UWP).</summary>
       </Docs>
     </Member>
     <Member MemberName="PlainText">
diff --git a/docs/en/Xamarin.Essentials/EmailMessage.xml b/docs/en/Xamarin.Essentials/EmailMessage.xml
index e36536e39..e6b7c4845 100644
--- a/docs/en/Xamarin.Essentials/EmailMessage.xml
+++ b/docs/en/Xamarin.Essentials/EmailMessage.xml
@@ -107,7 +107,7 @@
         <ReturnType>Xamarin.Essentials.EmailBodyFormat</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Gets or sets a value indicating whether the message is in plain text or HTML.</summary>
+        <summary>Gets or sets a value indicating whether the message is in plain text or HTML (not supported on UWP).</summary>
         <value></value>
         <remarks></remarks>
       </Docs>

From 1f412f23a38bd2fbe415fed477f14fe566fd9d37 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Sun, 4 Nov 2018 02:27:39 +0200
Subject: [PATCH 23/43] [Map] Fixed the type names and enum values. Closes #576

---
 DeviceTests/DeviceTests.Shared/Maps_Tests.cs  | 12 ++---
 Samples/Samples/View/MapsPage.xaml            |  8 ++-
 Samples/Samples/ViewModel/MapsViewModel.cs    | 35 ++++++------
 Tests/Maps_Tests.cs                           | 20 +++----
 .../Maps.android.cs => Map/Map.android.cs}    | 22 ++++----
 .../{Maps/Maps.ios.cs => Map/Map.ios.cs}      | 20 +++----
 .../Map.netstandard.cs}                       |  6 +--
 .../Maps.shared.cs => Map/Map.shared.cs}      | 14 ++---
 .../{Maps/Maps.uwp.cs => Map/Map.uwp.cs}      | 22 ++++----
 .../Map/MapLaunchOptions.shared.cs            |  9 ++++
 .../Map/NavigationMode.shared.cs              | 12 +++++
 .../Maps/MapDirectionsMode.shared.cs          | 12 -----
 .../Maps/MapLaunchOptions.shared.cs           |  9 ----
 .../Types/LocationExtensions.shared.cs        |  6 +--
 .../Types/PlacemarkExtensions.shared.cs       |  6 +--
 .../xamarin-essentials-android.xml            | 44 +++++++--------
 .../xamarin-essentials-ios.xml                | 44 +++++++--------
 .../xamarin-essentials-uwp.xml                | 44 +++++++--------
 .../en/FrameworksIndex/xamarin-essentials.xml | 44 +++++++--------
 .../Xamarin.Essentials/LocationExtensions.xml |  8 +--
 .../Xamarin.Essentials/{Maps.xml => Map.xml}  | 38 ++++++-------
 ...LaunchOptions.xml => MapLaunchOptions.xml} | 48 ++++++++---------
 ...pDirectionsMode.xml => NavigationMode.xml} | 54 +++++++++----------
 .../PlacemarkExtensions.xml                   |  8 +--
 docs/en/index.xml                             | 28 +++++-----
 25 files changed, 286 insertions(+), 287 deletions(-)
 rename Xamarin.Essentials/{Maps/Maps.android.cs => Map/Map.android.cs} (75%)
 rename Xamarin.Essentials/{Maps/Maps.ios.cs => Map/Map.ios.cs} (82%)
 rename Xamarin.Essentials/{Maps/Maps.netstandard.cs => Map/Map.netstandard.cs} (74%)
 rename Xamarin.Essentials/{Maps/Maps.shared.cs => Map/Map.shared.cs} (72%)
 rename Xamarin.Essentials/{Maps/Maps.uwp.cs => Map/Map.uwp.cs} (74%)
 create mode 100644 Xamarin.Essentials/Map/MapLaunchOptions.shared.cs
 create mode 100644 Xamarin.Essentials/Map/NavigationMode.shared.cs
 delete mode 100644 Xamarin.Essentials/Maps/MapDirectionsMode.shared.cs
 delete mode 100644 Xamarin.Essentials/Maps/MapLaunchOptions.shared.cs
 rename docs/en/Xamarin.Essentials/{Maps.xml => Map.xml} (85%)
 rename docs/en/Xamarin.Essentials/{MapsLaunchOptions.xml => MapLaunchOptions.xml} (74%)
 rename docs/en/Xamarin.Essentials/{MapDirectionsMode.xml => NavigationMode.xml} (70%)

diff --git a/DeviceTests/DeviceTests.Shared/Maps_Tests.cs b/DeviceTests/DeviceTests.Shared/Maps_Tests.cs
index cf1e0a9c8..ec06693cb 100644
--- a/DeviceTests/DeviceTests.Shared/Maps_Tests.cs
+++ b/DeviceTests/DeviceTests.Shared/Maps_Tests.cs
@@ -15,7 +15,7 @@ public class Maps_Tests
         [Trait(Traits.InteractionType, Traits.InteractionTypes.Human)]
         public async Task LaunchMap_CoordinatesDisplayCorrectPlace()
         {
-            await Maps.OpenAsync(testLatitude, testLongitude, new MapsLaunchOptions { Name = mapName });
+            await Map.OpenAsync(testLatitude, testLongitude, new MapLaunchOptions { Name = mapName });
         }
 
         [Fact]
@@ -29,28 +29,28 @@ public async Task LaunchMap_PlacemarkDisplayCorrectPlace()
                 Thoroughfare = "Microsoft Building 25",
                 Locality = "Redmond"
             };
-            await Maps.OpenAsync(placemark, new MapsLaunchOptions { Name = mapName });
+            await Map.OpenAsync(placemark, new MapLaunchOptions { Name = mapName });
         }
 
         [Fact]
         public async Task LaunchMap_NullLocation()
         {
             Location location = null;
-            await Assert.ThrowsAsync<ArgumentNullException>(() => Maps.OpenAsync(location));
+            await Assert.ThrowsAsync<ArgumentNullException>(() => Map.OpenAsync(location));
         }
 
         [Fact]
         public async Task LaunchMap_NullOptionsLocation()
         {
             var location = new Location(testLatitude, testLongitude);
-            await Assert.ThrowsAsync<ArgumentNullException>(() => Maps.OpenAsync(location, null));
+            await Assert.ThrowsAsync<ArgumentNullException>(() => Map.OpenAsync(location, null));
         }
 
         [Fact]
         public async Task LaunchMap_NullPlacemark()
         {
             Placemark location = null;
-            await Assert.ThrowsAsync<ArgumentNullException>(() => Maps.OpenAsync(location));
+            await Assert.ThrowsAsync<ArgumentNullException>(() => Map.OpenAsync(location));
         }
 
         [Fact]
@@ -63,7 +63,7 @@ public async Task LaunchMap_NullOptionsPlacemark()
                 Thoroughfare = "Microsoft Building 25",
                 Locality = "Redmond"
             };
-            await Assert.ThrowsAsync<ArgumentNullException>(() => Maps.OpenAsync(placemark, null));
+            await Assert.ThrowsAsync<ArgumentNullException>(() => Map.OpenAsync(placemark, null));
         }
     }
 }
diff --git a/Samples/Samples/View/MapsPage.xaml b/Samples/Samples/View/MapsPage.xaml
index 04c0d4a25..e72e2cfb1 100644
--- a/Samples/Samples/View/MapsPage.xaml
+++ b/Samples/Samples/View/MapsPage.xaml
@@ -13,14 +13,12 @@
             <Label Text="Open location in maps." FontAttributes="Bold"/>
 
             <Label Text="Options:"/>
-            <Label Text="Navigation Mode (iOS Only)"/>
+            <Label Text="Navigation Mode"/>
             <Picker HorizontalOptions="FillAndExpand"
-                        ItemsSource="{Binding DirectionModes}"
-                        SelectedIndex="{Binding DirectionMode, Mode=TwoWay}" />
+                    ItemsSource="{Binding NavigationModes}"
+                    SelectedIndex="{Binding NavigationMode, Mode=TwoWay}" />
             <Label Text="Name"/>
             <Entry Text="{Binding Name}"/>
-                
-                
 
             <Label Text="Latitude" Margin="0,24,0,0" />
             <Entry Keyboard="Numeric" Text="{Binding Latitude}" />
diff --git a/Samples/Samples/ViewModel/MapsViewModel.cs b/Samples/Samples/ViewModel/MapsViewModel.cs
index 9642561dd..c5f252e25 100644
--- a/Samples/Samples/ViewModel/MapsViewModel.cs
+++ b/Samples/Samples/ViewModel/MapsViewModel.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Windows.Input;
 using Xamarin.Essentials;
 using Xamarin.Forms;
@@ -71,23 +72,15 @@ public string ZipCode
             set => SetProperty(ref zipCode, value);
         }
 
-        public List<string> DirectionModes { get; } =
-           new List<string>
-           {
-                "None",
-                "Bicycling",
-                "Default",
-                "Driving",
-                "Transit",
-                "Walking"
-           };
+        public string[] NavigationModes { get; } =
+           Enum.GetNames(typeof(NavigationMode));
 
-        int directionMode;
+        int navigationMode;
 
-        public int DirectionMode
+        public int NavigationMode
         {
-            get => directionMode;
-            set => SetProperty(ref directionMode, value);
+            get => navigationMode;
+            set => SetProperty(ref navigationMode, value);
         }
 
         public ICommand MapsCommand { get; }
@@ -102,7 +95,11 @@ public MapsViewModel()
 
         async void OpenLocation()
         {
-            await Maps.OpenAsync(double.Parse(Latitude), double.Parse(Longitude), new MapsLaunchOptions { Name = Name, MapDirectionsMode = (MapDirectionsMode)DirectionMode });
+            await Map.OpenAsync(double.Parse(Latitude), double.Parse(Longitude), new MapLaunchOptions
+            {
+                Name = Name,
+                NavigationMode = (NavigationMode)NavigationMode
+            });
         }
 
         async void OpenPlacemark()
@@ -115,7 +112,11 @@ async void OpenPlacemark()
                 Thoroughfare = Thoroughfare,
                 PostalCode = ZipCode
             };
-            await Maps.OpenAsync(placemark, new MapsLaunchOptions() { Name = Name, MapDirectionsMode = (MapDirectionsMode)DirectionMode });
+            await Map.OpenAsync(placemark, new MapLaunchOptions
+            {
+                Name = Name,
+                NavigationMode = (NavigationMode)NavigationMode
+            });
         }
     }
 }
diff --git a/Tests/Maps_Tests.cs b/Tests/Maps_Tests.cs
index e5556b689..5a4d8c564 100644
--- a/Tests/Maps_Tests.cs
+++ b/Tests/Maps_Tests.cs
@@ -14,44 +14,44 @@ public class Maps_Tests
         [Fact]
         public async Task Open_Map_LatLong_NetStandard() =>
           await Assert.ThrowsAsync<NotImplementedInReferenceAssemblyException>(
-              () => Maps.OpenAsync(
+              () => Map.OpenAsync(
                   testLatitude,
                   testLongitude,
-                  new MapsLaunchOptions { Name = mapName }));
+                  new MapLaunchOptions { Name = mapName }));
 
         [Fact]
         public async Task Open_Map_Location_NetStandard() =>
           await Assert.ThrowsAsync<NotImplementedInReferenceAssemblyException>(
-              () => Maps.OpenAsync(
+              () => Map.OpenAsync(
                   new Location(testLatitude, testLongitude),
-                  new MapsLaunchOptions { Name = mapName }));
+                  new MapLaunchOptions { Name = mapName }));
 
         [Fact]
         public async Task Open_Map_Placemark_NetStandard() =>
           await Assert.ThrowsAsync<NotImplementedInReferenceAssemblyException>(
-              () => Maps.OpenAsync(
+              () => Map.OpenAsync(
                   new Placemark(),
-                  new MapsLaunchOptions { Name = mapName }));
+                  new MapLaunchOptions { Name = mapName }));
 
         [Fact]
         public async Task LaunchMap_NullLocation()
         {
             Location location = null;
-            await Assert.ThrowsAsync<ArgumentNullException>(() => Maps.OpenAsync(location));
+            await Assert.ThrowsAsync<ArgumentNullException>(() => Map.OpenAsync(location));
         }
 
         [Fact]
         public async Task LaunchMap_NullOptionsLocation()
         {
             var location = new Location(testLatitude, testLongitude);
-            await Assert.ThrowsAsync<ArgumentNullException>(() => Maps.OpenAsync(location, null));
+            await Assert.ThrowsAsync<ArgumentNullException>(() => Map.OpenAsync(location, null));
         }
 
         [Fact]
         public async Task LaunchMap_NullPlacemark()
         {
             Placemark location = null;
-            await Assert.ThrowsAsync<ArgumentNullException>(() => Maps.OpenAsync(location));
+            await Assert.ThrowsAsync<ArgumentNullException>(() => Map.OpenAsync(location));
         }
 
         [Fact]
@@ -64,7 +64,7 @@ public async Task LaunchMap_NullOptionsPlacemark()
                 Thoroughfare = "Microsoft Building 25",
                 Locality = "Redmond"
             };
-            await Assert.ThrowsAsync<ArgumentNullException>(() => Maps.OpenAsync(placemark, null));
+            await Assert.ThrowsAsync<ArgumentNullException>(() => Map.OpenAsync(placemark, null));
         }
     }
 }
diff --git a/Xamarin.Essentials/Maps/Maps.android.cs b/Xamarin.Essentials/Map/Map.android.cs
similarity index 75%
rename from Xamarin.Essentials/Maps/Maps.android.cs
rename to Xamarin.Essentials/Map/Map.android.cs
index b90250ef9..a6dbf441e 100644
--- a/Xamarin.Essentials/Maps/Maps.android.cs
+++ b/Xamarin.Essentials/Map/Map.android.cs
@@ -5,15 +5,15 @@
 
 namespace Xamarin.Essentials
 {
-    public static partial class Maps
+    public static partial class Map
     {
-        internal static Task PlatformOpenMapsAsync(double latitude, double longitude, MapsLaunchOptions options)
+        internal static Task PlatformOpenMapsAsync(double latitude, double longitude, MapLaunchOptions options)
         {
             var uri = string.Empty;
             var lat = latitude.ToString(CultureInfo.InvariantCulture);
             var lng = longitude.ToString(CultureInfo.InvariantCulture);
 
-            if (options.MapDirectionsMode == MapDirectionsMode.None)
+            if (options.NavigationMode == NavigationMode.None)
             {
                 uri = $"geo:{lat},{lng}?q={lat},{lng}";
 
@@ -22,29 +22,29 @@ internal static Task PlatformOpenMapsAsync(double latitude, double longitude, Ma
             }
             else
             {
-                uri = $"google.navigation:q={lat},{lng}{GetMode(options.MapDirectionsMode)}";
+                uri = $"google.navigation:q={lat},{lng}{GetMode(options.NavigationMode)}";
             }
 
             StartIntent(uri);
             return Task.CompletedTask;
         }
 
-        internal static string GetMode(MapDirectionsMode mode)
+        internal static string GetMode(NavigationMode mode)
         {
             switch (mode)
             {
-                case MapDirectionsMode.Bicycling: return "&mode=b";
-                case MapDirectionsMode.Driving: return "&mode=d";
-                case MapDirectionsMode.Walking: return "&mode=w";
+                case NavigationMode.Bicycling: return "&mode=b";
+                case NavigationMode.Driving: return "&mode=d";
+                case NavigationMode.Walking: return "&mode=w";
             }
             return string.Empty;
         }
 
-        internal static Task PlatformOpenMapsAsync(Placemark placemark, MapsLaunchOptions options)
+        internal static Task PlatformOpenMapsAsync(Placemark placemark, MapLaunchOptions options)
         {
             placemark = placemark.Escape();
             var uri = string.Empty;
-            if (options.MapDirectionsMode == MapDirectionsMode.None)
+            if (options.NavigationMode == NavigationMode.None)
             {
                 uri = $"geo:0,0?q={placemark.Thoroughfare} {placemark.Locality} {placemark.AdminArea} {placemark.PostalCode} {placemark.CountryName}";
                 if (!string.IsNullOrWhiteSpace(options.Name))
@@ -52,7 +52,7 @@ internal static Task PlatformOpenMapsAsync(Placemark placemark, MapsLaunchOption
             }
             else
             {
-                uri = $"google.navigation:q={placemark.Thoroughfare} {placemark.Locality} {placemark.AdminArea} {placemark.PostalCode} {placemark.CountryName}{GetMode(options.MapDirectionsMode)}";
+                uri = $"google.navigation:q={placemark.Thoroughfare} {placemark.Locality} {placemark.AdminArea} {placemark.PostalCode} {placemark.CountryName}{GetMode(options.NavigationMode)}";
             }
 
             StartIntent(uri);
diff --git a/Xamarin.Essentials/Maps/Maps.ios.cs b/Xamarin.Essentials/Map/Map.ios.cs
similarity index 82%
rename from Xamarin.Essentials/Maps/Maps.ios.cs
rename to Xamarin.Essentials/Map/Map.ios.cs
index 01c38c43b..c7a319226 100644
--- a/Xamarin.Essentials/Maps/Maps.ios.cs
+++ b/Xamarin.Essentials/Map/Map.ios.cs
@@ -7,9 +7,9 @@
 
 namespace Xamarin.Essentials
 {
-    public static partial class Maps
+    public static partial class Map
     {
-        internal static Task PlatformOpenMapsAsync(double latitude, double longitude, MapsLaunchOptions options)
+        internal static Task PlatformOpenMapsAsync(double latitude, double longitude, MapLaunchOptions options)
         {
             if (string.IsNullOrWhiteSpace(options.Name))
                 options.Name = string.Empty;
@@ -19,7 +19,7 @@ internal static Task PlatformOpenMapsAsync(double latitude, double longitude, Ma
             return OpenPlacemark(placemark, options);
         }
 
-        internal static async Task PlatformOpenMapsAsync(Placemark placemark, MapsLaunchOptions options)
+        internal static async Task PlatformOpenMapsAsync(Placemark placemark, MapLaunchOptions options)
         {
             var address = new MKPlacemarkAddress
             {
@@ -51,7 +51,7 @@ internal static async Task PlatformOpenMapsAsync(Placemark placemark, MapsLaunch
             await OpenPlacemark(new MKPlacemark(placemarks[0].Location.Coordinate, address), options);
         }
 
-        static Task OpenPlacemark(MKPlacemark placemark, MapsLaunchOptions options)
+        static Task OpenPlacemark(MKPlacemark placemark, MapLaunchOptions options)
         {
             var mapItem = new MKMapItem(placemark)
             {
@@ -59,22 +59,22 @@ static Task OpenPlacemark(MKPlacemark placemark, MapsLaunchOptions options)
             };
 
             MKLaunchOptions launchOptions = null;
-            if (options.MapDirectionsMode != MapDirectionsMode.None)
+            if (options.NavigationMode != NavigationMode.None)
             {
                 var mode = MKDirectionsMode.Default;
 
-                switch (options.MapDirectionsMode)
+                switch (options.NavigationMode)
                 {
-                    case MapDirectionsMode.Driving:
+                    case NavigationMode.Driving:
                         mode = MKDirectionsMode.Driving;
                         break;
-                    case MapDirectionsMode.Transit:
+                    case NavigationMode.Transit:
                         mode = MKDirectionsMode.Transit;
                         break;
-                    case MapDirectionsMode.Walking:
+                    case NavigationMode.Walking:
                         mode = MKDirectionsMode.Walking;
                         break;
-                    case MapDirectionsMode.Default:
+                    case NavigationMode.Default:
                         mode = MKDirectionsMode.Default;
                         break;
                 }
diff --git a/Xamarin.Essentials/Maps/Maps.netstandard.cs b/Xamarin.Essentials/Map/Map.netstandard.cs
similarity index 74%
rename from Xamarin.Essentials/Maps/Maps.netstandard.cs
rename to Xamarin.Essentials/Map/Map.netstandard.cs
index 7c315680b..8faef3e9a 100644
--- a/Xamarin.Essentials/Maps/Maps.netstandard.cs
+++ b/Xamarin.Essentials/Map/Map.netstandard.cs
@@ -2,12 +2,12 @@
 
 namespace Xamarin.Essentials
 {
-    public static partial class Maps
+    public static partial class Map
     {
-        internal static Task PlatformOpenMapsAsync(double latitude, double longitude, MapsLaunchOptions options)
+        internal static Task PlatformOpenMapsAsync(double latitude, double longitude, MapLaunchOptions options)
             => throw new NotImplementedInReferenceAssemblyException();
 
-        internal static Task PlatformOpenMapsAsync(Placemark placemark, MapsLaunchOptions options)
+        internal static Task PlatformOpenMapsAsync(Placemark placemark, MapLaunchOptions options)
             => throw new NotImplementedInReferenceAssemblyException();
     }
 }
diff --git a/Xamarin.Essentials/Maps/Maps.shared.cs b/Xamarin.Essentials/Map/Map.shared.cs
similarity index 72%
rename from Xamarin.Essentials/Maps/Maps.shared.cs
rename to Xamarin.Essentials/Map/Map.shared.cs
index 4971c2f84..b5494976e 100644
--- a/Xamarin.Essentials/Maps/Maps.shared.cs
+++ b/Xamarin.Essentials/Map/Map.shared.cs
@@ -3,12 +3,12 @@
 
 namespace Xamarin.Essentials
 {
-    public static partial class Maps
+    public static partial class Map
     {
         public static Task OpenAsync(Location location) =>
-            OpenAsync(location, new MapsLaunchOptions());
+            OpenAsync(location, new MapLaunchOptions());
 
-        public static Task OpenAsync(Location location, MapsLaunchOptions options)
+        public static Task OpenAsync(Location location, MapLaunchOptions options)
         {
             if (location == null)
                 throw new ArgumentNullException(nameof(location));
@@ -20,9 +20,9 @@ public static Task OpenAsync(Location location, MapsLaunchOptions options)
         }
 
         public static Task OpenAsync(double latitude, double longitude) =>
-            OpenAsync(latitude, longitude, new MapsLaunchOptions());
+            OpenAsync(latitude, longitude, new MapLaunchOptions());
 
-        public static Task OpenAsync(double latitude, double longitude, MapsLaunchOptions options)
+        public static Task OpenAsync(double latitude, double longitude, MapLaunchOptions options)
         {
             if (options == null)
                 throw new ArgumentNullException(nameof(options));
@@ -31,9 +31,9 @@ public static Task OpenAsync(double latitude, double longitude, MapsLaunchOption
         }
 
         public static Task OpenAsync(Placemark placemark) =>
-            OpenAsync(placemark, new MapsLaunchOptions());
+            OpenAsync(placemark, new MapLaunchOptions());
 
-        public static Task OpenAsync(Placemark placemark, MapsLaunchOptions options)
+        public static Task OpenAsync(Placemark placemark, MapLaunchOptions options)
         {
             if (placemark == null)
                 throw new ArgumentNullException(nameof(placemark));
diff --git a/Xamarin.Essentials/Maps/Maps.uwp.cs b/Xamarin.Essentials/Map/Map.uwp.cs
similarity index 74%
rename from Xamarin.Essentials/Maps/Maps.uwp.cs
rename to Xamarin.Essentials/Map/Map.uwp.cs
index 101708e5d..a52c51666 100644
--- a/Xamarin.Essentials/Maps/Maps.uwp.cs
+++ b/Xamarin.Essentials/Map/Map.uwp.cs
@@ -4,44 +4,44 @@
 
 namespace Xamarin.Essentials
 {
-    public static partial class Maps
+    public static partial class Map
     {
-        internal static Task PlatformOpenMapsAsync(double latitude, double longitude, MapsLaunchOptions options)
+        internal static Task PlatformOpenMapsAsync(double latitude, double longitude, MapLaunchOptions options)
         {
             var lat = latitude.ToString(CultureInfo.InvariantCulture);
             var lng = longitude.ToString(CultureInfo.InvariantCulture);
             var name = options.Name ?? string.Empty;
             var uri = string.Empty;
 
-            if (options.MapDirectionsMode == MapDirectionsMode.None)
+            if (options.NavigationMode == NavigationMode.None)
             {
                 uri = $"bingmaps:?collection=point.{lat}_{lng}_{name}";
             }
             else
             {
-                uri = $"bingmaps:?rtp=~pos.{lat}_{lng}_{name}{GetMode(options.MapDirectionsMode)}";
+                uri = $"bingmaps:?rtp=~pos.{lat}_{lng}_{name}{GetMode(options.NavigationMode)}";
             }
 
             return LaunchUri(new Uri(uri));
         }
 
-        internal static string GetMode(MapDirectionsMode mode)
+        internal static string GetMode(NavigationMode mode)
         {
             switch (mode)
             {
-                case MapDirectionsMode.Driving: return "&mode=d";
-                case MapDirectionsMode.Transit: return "&mode=t";
-                case MapDirectionsMode.Walking: return "&mode=w";
+                case NavigationMode.Driving: return "&mode=d";
+                case NavigationMode.Transit: return "&mode=t";
+                case NavigationMode.Walking: return "&mode=w";
             }
             return string.Empty;
         }
 
-        internal static Task PlatformOpenMapsAsync(Placemark placemark, MapsLaunchOptions options)
+        internal static Task PlatformOpenMapsAsync(Placemark placemark, MapLaunchOptions options)
         {
             placemark = placemark.Escape();
             var uri = string.Empty;
 
-            if (options.MapDirectionsMode == MapDirectionsMode.None)
+            if (options.NavigationMode == NavigationMode.None)
             {
                 uri = $"bingmaps:?where=" +
                     $"{placemark.Thoroughfare}" +
@@ -58,7 +58,7 @@ internal static Task PlatformOpenMapsAsync(Placemark placemark, MapsLaunchOption
                     $"%20{placemark.AdminArea}" +
                     $"%20{placemark.PostalCode}" +
                     $"%20{placemark.CountryName}" +
-                    $"{GetMode(options.MapDirectionsMode)}";
+                    $"{GetMode(options.NavigationMode)}";
             }
 
             return LaunchUri(new Uri(uri));
diff --git a/Xamarin.Essentials/Map/MapLaunchOptions.shared.cs b/Xamarin.Essentials/Map/MapLaunchOptions.shared.cs
new file mode 100644
index 000000000..a2cfe4739
--- /dev/null
+++ b/Xamarin.Essentials/Map/MapLaunchOptions.shared.cs
@@ -0,0 +1,9 @@
+namespace Xamarin.Essentials
+{
+    public class MapLaunchOptions
+    {
+        public NavigationMode NavigationMode { get; set; } = NavigationMode.None;
+
+        public string Name { get; set; } = string.Empty;
+    }
+}
diff --git a/Xamarin.Essentials/Map/NavigationMode.shared.cs b/Xamarin.Essentials/Map/NavigationMode.shared.cs
new file mode 100644
index 000000000..3176aaac7
--- /dev/null
+++ b/Xamarin.Essentials/Map/NavigationMode.shared.cs
@@ -0,0 +1,12 @@
+namespace Xamarin.Essentials
+{
+    public enum NavigationMode
+    {
+        None = 0,
+        Default = 1,
+        Bicycling = 2,
+        Driving = 3,
+        Transit = 4,
+        Walking = 5,
+    }
+}
diff --git a/Xamarin.Essentials/Maps/MapDirectionsMode.shared.cs b/Xamarin.Essentials/Maps/MapDirectionsMode.shared.cs
deleted file mode 100644
index 7c0a9c246..000000000
--- a/Xamarin.Essentials/Maps/MapDirectionsMode.shared.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Xamarin.Essentials
-{
-    public enum MapDirectionsMode
-    {
-        None,
-        Bicycling,
-        Default,
-        Driving,
-        Transit,
-        Walking,
-    }
-}
diff --git a/Xamarin.Essentials/Maps/MapLaunchOptions.shared.cs b/Xamarin.Essentials/Maps/MapLaunchOptions.shared.cs
deleted file mode 100644
index 64442d539..000000000
--- a/Xamarin.Essentials/Maps/MapLaunchOptions.shared.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Xamarin.Essentials
-{
-    public class MapsLaunchOptions
-    {
-        public MapDirectionsMode MapDirectionsMode { get; set; } = MapDirectionsMode.None;
-
-        public string Name { get; set; } = string.Empty;
-    }
-}
diff --git a/Xamarin.Essentials/Types/LocationExtensions.shared.cs b/Xamarin.Essentials/Types/LocationExtensions.shared.cs
index 00336ea75..2b7f415e2 100644
--- a/Xamarin.Essentials/Types/LocationExtensions.shared.cs
+++ b/Xamarin.Essentials/Types/LocationExtensions.shared.cs
@@ -10,10 +10,10 @@ public static double CalculateDistance(this Location locationStart, double latit
         public static double CalculateDistance(this Location locationStart, Location locationEnd, DistanceUnits units) =>
             Location.CalculateDistance(locationStart, locationEnd, units);
 
-        public static Task OpenMapsAsync(this Location location, MapsLaunchOptions options) =>
-            Maps.OpenAsync(location, options);
+        public static Task OpenMapsAsync(this Location location, MapLaunchOptions options) =>
+            Map.OpenAsync(location, options);
 
         public static Task OpenMapsAsync(this Location location) =>
-            Maps.OpenAsync(location);
+            Map.OpenAsync(location);
     }
 }
diff --git a/Xamarin.Essentials/Types/PlacemarkExtensions.shared.cs b/Xamarin.Essentials/Types/PlacemarkExtensions.shared.cs
index 421e06550..52f4b9cfa 100644
--- a/Xamarin.Essentials/Types/PlacemarkExtensions.shared.cs
+++ b/Xamarin.Essentials/Types/PlacemarkExtensions.shared.cs
@@ -5,11 +5,11 @@ namespace Xamarin.Essentials
 {
     public static partial class PlacemarkExtensions
     {
-        public static Task OpenMapsAsync(this Placemark placemark, MapsLaunchOptions options) =>
-            Maps.OpenAsync(placemark, options);
+        public static Task OpenMapsAsync(this Placemark placemark, MapLaunchOptions options) =>
+            Map.OpenAsync(placemark, options);
 
         public static Task OpenMapsAsync(this Placemark placemark) =>
-            Maps.OpenAsync(placemark);
+            Map.OpenAsync(placemark);
 
         internal static Placemark Escape(this Placemark placemark)
         {
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-android.xml b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
index cba063834..5aaa367b3 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-android.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
@@ -305,7 +305,7 @@
       <Member Id="M:Xamarin.Essentials.LocationExtensions.CalculateDistance(Xamarin.Essentials.Location,System.Double,System.Double,Xamarin.Essentials.DistanceUnits)" />
       <Member Id="M:Xamarin.Essentials.LocationExtensions.CalculateDistance(Xamarin.Essentials.Location,Xamarin.Essentials.Location,Xamarin.Essentials.DistanceUnits)" />
       <Member Id="M:Xamarin.Essentials.LocationExtensions.OpenMapsAsync(Xamarin.Essentials.Location)" />
-      <Member Id="M:Xamarin.Essentials.LocationExtensions.OpenMapsAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapsLaunchOptions)" />
+      <Member Id="M:Xamarin.Essentials.LocationExtensions.OpenMapsAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapLaunchOptions)" />
     </Type>
     <Type Name="Xamarin.Essentials.Magnetometer" Id="T:Xamarin.Essentials.Magnetometer">
       <Member Id="E:Xamarin.Essentials.Magnetometer.ReadingChanged" />
@@ -329,26 +329,26 @@
       <Member Id="M:Xamarin.Essentials.MainThread.BeginInvokeOnMainThread(System.Action)" />
       <Member Id="P:Xamarin.Essentials.MainThread.IsMainThread" />
     </Type>
-    <Type Name="Xamarin.Essentials.MapDirectionsMode" Id="T:Xamarin.Essentials.MapDirectionsMode">
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.Bicycling" />
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.Default" />
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.Driving" />
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.None" />
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.Transit" />
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.Walking" />
-    </Type>
-    <Type Name="Xamarin.Essentials.Maps" Id="T:Xamarin.Essentials.Maps">
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(System.Double,System.Double)" />
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(System.Double,System.Double,Xamarin.Essentials.MapsLaunchOptions)" />
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(Xamarin.Essentials.Location)" />
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapsLaunchOptions)" />
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(Xamarin.Essentials.Placemark)" />
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapsLaunchOptions)" />
-    </Type>
-    <Type Name="Xamarin.Essentials.MapsLaunchOptions" Id="T:Xamarin.Essentials.MapsLaunchOptions">
-      <Member Id="M:Xamarin.Essentials.MapsLaunchOptions.#ctor" />
-      <Member Id="P:Xamarin.Essentials.MapsLaunchOptions.MapDirectionsMode" />
-      <Member Id="P:Xamarin.Essentials.MapsLaunchOptions.Name" />
+    <Type Name="Xamarin.Essentials.Map" Id="T:Xamarin.Essentials.Map">
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(System.Double,System.Double,Xamarin.Essentials.MapLaunchOptions)" />
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(Xamarin.Essentials.Location)" />
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapLaunchOptions)" />
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(Xamarin.Essentials.Placemark)" />
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapLaunchOptions)" />
+    </Type>
+    <Type Name="Xamarin.Essentials.MapLaunchOptions" Id="T:Xamarin.Essentials.MapLaunchOptions">
+      <Member Id="M:Xamarin.Essentials.MapLaunchOptions.#ctor" />
+      <Member Id="P:Xamarin.Essentials.MapLaunchOptions.Name" />
+      <Member Id="P:Xamarin.Essentials.MapLaunchOptions.NavigationMode" />
+    </Type>
+    <Type Name="Xamarin.Essentials.NavigationMode" Id="T:Xamarin.Essentials.NavigationMode">
+      <Member Id="F:Xamarin.Essentials.NavigationMode.Bicycling" />
+      <Member Id="F:Xamarin.Essentials.NavigationMode.Default" />
+      <Member Id="F:Xamarin.Essentials.NavigationMode.Driving" />
+      <Member Id="F:Xamarin.Essentials.NavigationMode.None" />
+      <Member Id="F:Xamarin.Essentials.NavigationMode.Transit" />
+      <Member Id="F:Xamarin.Essentials.NavigationMode.Walking" />
     </Type>
     <Type Name="Xamarin.Essentials.NetworkAccess" Id="T:Xamarin.Essentials.NetworkAccess">
       <Member Id="F:Xamarin.Essentials.NetworkAccess.ConstrainedInternet" />
@@ -402,7 +402,7 @@
     </Type>
     <Type Name="Xamarin.Essentials.PlacemarkExtensions" Id="T:Xamarin.Essentials.PlacemarkExtensions">
       <Member Id="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark)" />
-      <Member Id="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapsLaunchOptions)" />
+      <Member Id="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapLaunchOptions)" />
     </Type>
     <Type Name="Xamarin.Essentials.Platform" Id="T:Xamarin.Essentials.Platform">
       <Member Id="M:Xamarin.Essentials.Platform.Init(Android.App.Activity,Android.OS.Bundle)" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
index fee864320..03fe6d94b 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
@@ -306,7 +306,7 @@
       <Member Id="M:Xamarin.Essentials.LocationExtensions.CalculateDistance(Xamarin.Essentials.Location,System.Double,System.Double,Xamarin.Essentials.DistanceUnits)" />
       <Member Id="M:Xamarin.Essentials.LocationExtensions.CalculateDistance(Xamarin.Essentials.Location,Xamarin.Essentials.Location,Xamarin.Essentials.DistanceUnits)" />
       <Member Id="M:Xamarin.Essentials.LocationExtensions.OpenMapsAsync(Xamarin.Essentials.Location)" />
-      <Member Id="M:Xamarin.Essentials.LocationExtensions.OpenMapsAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapsLaunchOptions)" />
+      <Member Id="M:Xamarin.Essentials.LocationExtensions.OpenMapsAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapLaunchOptions)" />
     </Type>
     <Type Name="Xamarin.Essentials.Magnetometer" Id="T:Xamarin.Essentials.Magnetometer">
       <Member Id="E:Xamarin.Essentials.Magnetometer.ReadingChanged" />
@@ -330,26 +330,26 @@
       <Member Id="M:Xamarin.Essentials.MainThread.BeginInvokeOnMainThread(System.Action)" />
       <Member Id="P:Xamarin.Essentials.MainThread.IsMainThread" />
     </Type>
-    <Type Name="Xamarin.Essentials.MapDirectionsMode" Id="T:Xamarin.Essentials.MapDirectionsMode">
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.Bicycling" />
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.Default" />
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.Driving" />
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.None" />
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.Transit" />
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.Walking" />
-    </Type>
-    <Type Name="Xamarin.Essentials.Maps" Id="T:Xamarin.Essentials.Maps">
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(System.Double,System.Double)" />
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(System.Double,System.Double,Xamarin.Essentials.MapsLaunchOptions)" />
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(Xamarin.Essentials.Location)" />
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapsLaunchOptions)" />
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(Xamarin.Essentials.Placemark)" />
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapsLaunchOptions)" />
-    </Type>
-    <Type Name="Xamarin.Essentials.MapsLaunchOptions" Id="T:Xamarin.Essentials.MapsLaunchOptions">
-      <Member Id="M:Xamarin.Essentials.MapsLaunchOptions.#ctor" />
-      <Member Id="P:Xamarin.Essentials.MapsLaunchOptions.MapDirectionsMode" />
-      <Member Id="P:Xamarin.Essentials.MapsLaunchOptions.Name" />
+    <Type Name="Xamarin.Essentials.Map" Id="T:Xamarin.Essentials.Map">
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(System.Double,System.Double,Xamarin.Essentials.MapLaunchOptions)" />
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(Xamarin.Essentials.Location)" />
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapLaunchOptions)" />
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(Xamarin.Essentials.Placemark)" />
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapLaunchOptions)" />
+    </Type>
+    <Type Name="Xamarin.Essentials.MapLaunchOptions" Id="T:Xamarin.Essentials.MapLaunchOptions">
+      <Member Id="M:Xamarin.Essentials.MapLaunchOptions.#ctor" />
+      <Member Id="P:Xamarin.Essentials.MapLaunchOptions.Name" />
+      <Member Id="P:Xamarin.Essentials.MapLaunchOptions.NavigationMode" />
+    </Type>
+    <Type Name="Xamarin.Essentials.NavigationMode" Id="T:Xamarin.Essentials.NavigationMode">
+      <Member Id="F:Xamarin.Essentials.NavigationMode.Bicycling" />
+      <Member Id="F:Xamarin.Essentials.NavigationMode.Default" />
+      <Member Id="F:Xamarin.Essentials.NavigationMode.Driving" />
+      <Member Id="F:Xamarin.Essentials.NavigationMode.None" />
+      <Member Id="F:Xamarin.Essentials.NavigationMode.Transit" />
+      <Member Id="F:Xamarin.Essentials.NavigationMode.Walking" />
     </Type>
     <Type Name="Xamarin.Essentials.NetworkAccess" Id="T:Xamarin.Essentials.NetworkAccess">
       <Member Id="F:Xamarin.Essentials.NetworkAccess.ConstrainedInternet" />
@@ -403,7 +403,7 @@
     </Type>
     <Type Name="Xamarin.Essentials.PlacemarkExtensions" Id="T:Xamarin.Essentials.PlacemarkExtensions">
       <Member Id="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark)" />
-      <Member Id="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapsLaunchOptions)" />
+      <Member Id="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapLaunchOptions)" />
     </Type>
     <Type Name="Xamarin.Essentials.Platform" Id="T:Xamarin.Essentials.Platform" />
     <Type Name="Xamarin.Essentials.Preferences" Id="T:Xamarin.Essentials.Preferences">
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
index 7b53146ae..d5eab06df 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
@@ -305,7 +305,7 @@
       <Member Id="M:Xamarin.Essentials.LocationExtensions.CalculateDistance(Xamarin.Essentials.Location,System.Double,System.Double,Xamarin.Essentials.DistanceUnits)" />
       <Member Id="M:Xamarin.Essentials.LocationExtensions.CalculateDistance(Xamarin.Essentials.Location,Xamarin.Essentials.Location,Xamarin.Essentials.DistanceUnits)" />
       <Member Id="M:Xamarin.Essentials.LocationExtensions.OpenMapsAsync(Xamarin.Essentials.Location)" />
-      <Member Id="M:Xamarin.Essentials.LocationExtensions.OpenMapsAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapsLaunchOptions)" />
+      <Member Id="M:Xamarin.Essentials.LocationExtensions.OpenMapsAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapLaunchOptions)" />
     </Type>
     <Type Name="Xamarin.Essentials.Magnetometer" Id="T:Xamarin.Essentials.Magnetometer">
       <Member Id="E:Xamarin.Essentials.Magnetometer.ReadingChanged" />
@@ -329,26 +329,26 @@
       <Member Id="M:Xamarin.Essentials.MainThread.BeginInvokeOnMainThread(System.Action)" />
       <Member Id="P:Xamarin.Essentials.MainThread.IsMainThread" />
     </Type>
-    <Type Name="Xamarin.Essentials.MapDirectionsMode" Id="T:Xamarin.Essentials.MapDirectionsMode">
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.Bicycling" />
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.Default" />
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.Driving" />
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.None" />
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.Transit" />
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.Walking" />
-    </Type>
-    <Type Name="Xamarin.Essentials.Maps" Id="T:Xamarin.Essentials.Maps">
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(System.Double,System.Double)" />
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(System.Double,System.Double,Xamarin.Essentials.MapsLaunchOptions)" />
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(Xamarin.Essentials.Location)" />
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapsLaunchOptions)" />
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(Xamarin.Essentials.Placemark)" />
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapsLaunchOptions)" />
-    </Type>
-    <Type Name="Xamarin.Essentials.MapsLaunchOptions" Id="T:Xamarin.Essentials.MapsLaunchOptions">
-      <Member Id="M:Xamarin.Essentials.MapsLaunchOptions.#ctor" />
-      <Member Id="P:Xamarin.Essentials.MapsLaunchOptions.MapDirectionsMode" />
-      <Member Id="P:Xamarin.Essentials.MapsLaunchOptions.Name" />
+    <Type Name="Xamarin.Essentials.Map" Id="T:Xamarin.Essentials.Map">
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(System.Double,System.Double,Xamarin.Essentials.MapLaunchOptions)" />
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(Xamarin.Essentials.Location)" />
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapLaunchOptions)" />
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(Xamarin.Essentials.Placemark)" />
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapLaunchOptions)" />
+    </Type>
+    <Type Name="Xamarin.Essentials.MapLaunchOptions" Id="T:Xamarin.Essentials.MapLaunchOptions">
+      <Member Id="M:Xamarin.Essentials.MapLaunchOptions.#ctor" />
+      <Member Id="P:Xamarin.Essentials.MapLaunchOptions.Name" />
+      <Member Id="P:Xamarin.Essentials.MapLaunchOptions.NavigationMode" />
+    </Type>
+    <Type Name="Xamarin.Essentials.NavigationMode" Id="T:Xamarin.Essentials.NavigationMode">
+      <Member Id="F:Xamarin.Essentials.NavigationMode.Bicycling" />
+      <Member Id="F:Xamarin.Essentials.NavigationMode.Default" />
+      <Member Id="F:Xamarin.Essentials.NavigationMode.Driving" />
+      <Member Id="F:Xamarin.Essentials.NavigationMode.None" />
+      <Member Id="F:Xamarin.Essentials.NavigationMode.Transit" />
+      <Member Id="F:Xamarin.Essentials.NavigationMode.Walking" />
     </Type>
     <Type Name="Xamarin.Essentials.NetworkAccess" Id="T:Xamarin.Essentials.NetworkAccess">
       <Member Id="F:Xamarin.Essentials.NetworkAccess.ConstrainedInternet" />
@@ -402,7 +402,7 @@
     </Type>
     <Type Name="Xamarin.Essentials.PlacemarkExtensions" Id="T:Xamarin.Essentials.PlacemarkExtensions">
       <Member Id="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark)" />
-      <Member Id="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapsLaunchOptions)" />
+      <Member Id="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapLaunchOptions)" />
     </Type>
     <Type Name="Xamarin.Essentials.Platform" Id="T:Xamarin.Essentials.Platform">
       <Member Id="P:Xamarin.Essentials.Platform.MapServiceToken" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials.xml b/docs/en/FrameworksIndex/xamarin-essentials.xml
index 2b35472d9..e8d39e53d 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials.xml
@@ -305,7 +305,7 @@
       <Member Id="M:Xamarin.Essentials.LocationExtensions.CalculateDistance(Xamarin.Essentials.Location,System.Double,System.Double,Xamarin.Essentials.DistanceUnits)" />
       <Member Id="M:Xamarin.Essentials.LocationExtensions.CalculateDistance(Xamarin.Essentials.Location,Xamarin.Essentials.Location,Xamarin.Essentials.DistanceUnits)" />
       <Member Id="M:Xamarin.Essentials.LocationExtensions.OpenMapsAsync(Xamarin.Essentials.Location)" />
-      <Member Id="M:Xamarin.Essentials.LocationExtensions.OpenMapsAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapsLaunchOptions)" />
+      <Member Id="M:Xamarin.Essentials.LocationExtensions.OpenMapsAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapLaunchOptions)" />
     </Type>
     <Type Name="Xamarin.Essentials.Magnetometer" Id="T:Xamarin.Essentials.Magnetometer">
       <Member Id="E:Xamarin.Essentials.Magnetometer.ReadingChanged" />
@@ -329,26 +329,26 @@
       <Member Id="M:Xamarin.Essentials.MainThread.BeginInvokeOnMainThread(System.Action)" />
       <Member Id="P:Xamarin.Essentials.MainThread.IsMainThread" />
     </Type>
-    <Type Name="Xamarin.Essentials.MapDirectionsMode" Id="T:Xamarin.Essentials.MapDirectionsMode">
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.Bicycling" />
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.Default" />
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.Driving" />
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.None" />
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.Transit" />
-      <Member Id="F:Xamarin.Essentials.MapDirectionsMode.Walking" />
-    </Type>
-    <Type Name="Xamarin.Essentials.Maps" Id="T:Xamarin.Essentials.Maps">
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(System.Double,System.Double)" />
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(System.Double,System.Double,Xamarin.Essentials.MapsLaunchOptions)" />
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(Xamarin.Essentials.Location)" />
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapsLaunchOptions)" />
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(Xamarin.Essentials.Placemark)" />
-      <Member Id="M:Xamarin.Essentials.Maps.OpenAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapsLaunchOptions)" />
-    </Type>
-    <Type Name="Xamarin.Essentials.MapsLaunchOptions" Id="T:Xamarin.Essentials.MapsLaunchOptions">
-      <Member Id="M:Xamarin.Essentials.MapsLaunchOptions.#ctor" />
-      <Member Id="P:Xamarin.Essentials.MapsLaunchOptions.MapDirectionsMode" />
-      <Member Id="P:Xamarin.Essentials.MapsLaunchOptions.Name" />
+    <Type Name="Xamarin.Essentials.Map" Id="T:Xamarin.Essentials.Map">
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(System.Double,System.Double,Xamarin.Essentials.MapLaunchOptions)" />
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(Xamarin.Essentials.Location)" />
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapLaunchOptions)" />
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(Xamarin.Essentials.Placemark)" />
+      <Member Id="M:Xamarin.Essentials.Map.OpenAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapLaunchOptions)" />
+    </Type>
+    <Type Name="Xamarin.Essentials.MapLaunchOptions" Id="T:Xamarin.Essentials.MapLaunchOptions">
+      <Member Id="M:Xamarin.Essentials.MapLaunchOptions.#ctor" />
+      <Member Id="P:Xamarin.Essentials.MapLaunchOptions.Name" />
+      <Member Id="P:Xamarin.Essentials.MapLaunchOptions.NavigationMode" />
+    </Type>
+    <Type Name="Xamarin.Essentials.NavigationMode" Id="T:Xamarin.Essentials.NavigationMode">
+      <Member Id="F:Xamarin.Essentials.NavigationMode.Bicycling" />
+      <Member Id="F:Xamarin.Essentials.NavigationMode.Default" />
+      <Member Id="F:Xamarin.Essentials.NavigationMode.Driving" />
+      <Member Id="F:Xamarin.Essentials.NavigationMode.None" />
+      <Member Id="F:Xamarin.Essentials.NavigationMode.Transit" />
+      <Member Id="F:Xamarin.Essentials.NavigationMode.Walking" />
     </Type>
     <Type Name="Xamarin.Essentials.NetworkAccess" Id="T:Xamarin.Essentials.NetworkAccess">
       <Member Id="F:Xamarin.Essentials.NetworkAccess.ConstrainedInternet" />
@@ -402,7 +402,7 @@
     </Type>
     <Type Name="Xamarin.Essentials.PlacemarkExtensions" Id="T:Xamarin.Essentials.PlacemarkExtensions">
       <Member Id="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark)" />
-      <Member Id="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapsLaunchOptions)" />
+      <Member Id="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapLaunchOptions)" />
     </Type>
     <Type Name="Xamarin.Essentials.Preferences" Id="T:Xamarin.Essentials.Preferences">
       <Member Id="M:Xamarin.Essentials.Preferences.Clear" />
diff --git a/docs/en/Xamarin.Essentials/LocationExtensions.xml b/docs/en/Xamarin.Essentials/LocationExtensions.xml
index 0bfdd14bc..db5cac94b 100644
--- a/docs/en/Xamarin.Essentials/LocationExtensions.xml
+++ b/docs/en/Xamarin.Essentials/LocationExtensions.xml
@@ -92,9 +92,9 @@
       </Docs>
     </Member>
     <Member MemberName="OpenMapsAsync">
-      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenMapsAsync (this Xamarin.Essentials.Location location, Xamarin.Essentials.MapsLaunchOptions options);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenMapsAsync(class Xamarin.Essentials.Location location, class Xamarin.Essentials.MapsLaunchOptions options) cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.LocationExtensions.OpenMapsAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapsLaunchOptions)" />
+      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenMapsAsync (this Xamarin.Essentials.Location location, Xamarin.Essentials.MapLaunchOptions options);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenMapsAsync(class Xamarin.Essentials.Location location, class Xamarin.Essentials.MapLaunchOptions options) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.LocationExtensions.OpenMapsAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapLaunchOptions)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
@@ -105,7 +105,7 @@
       </ReturnValue>
       <Parameters>
         <Parameter Name="location" Type="Xamarin.Essentials.Location" RefType="this" />
-        <Parameter Name="options" Type="Xamarin.Essentials.MapsLaunchOptions" />
+        <Parameter Name="options" Type="Xamarin.Essentials.MapLaunchOptions" />
       </Parameters>
       <Docs>
         <param name="location">Location to open to.</param>
diff --git a/docs/en/Xamarin.Essentials/Maps.xml b/docs/en/Xamarin.Essentials/Map.xml
similarity index 85%
rename from docs/en/Xamarin.Essentials/Maps.xml
rename to docs/en/Xamarin.Essentials/Map.xml
index be600c78c..00a2666bb 100644
--- a/docs/en/Xamarin.Essentials/Maps.xml
+++ b/docs/en/Xamarin.Essentials/Map.xml
@@ -1,7 +1,7 @@
-<Type Name="Maps" FullName="Xamarin.Essentials.Maps">
-  <TypeSignature Language="C#" Value="public static class Maps" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi abstract sealed beforefieldinit Maps extends System.Object" />
-  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.Maps" />
+<Type Name="Map" FullName="Xamarin.Essentials.Map">
+  <TypeSignature Language="C#" Value="public static class Map" />
+  <TypeSignature Language="ILAsm" Value=".class public auto ansi abstract sealed beforefieldinit Map extends System.Object" />
+  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.Map" />
   <AssemblyInfo>
     <AssemblyName>Xamarin.Essentials</AssemblyName>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -18,7 +18,7 @@
     <Member MemberName="OpenAsync">
       <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenAsync (Xamarin.Essentials.Location location);" />
       <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenAsync(class Xamarin.Essentials.Location location) cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Maps.OpenAsync(Xamarin.Essentials.Location)" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Map.OpenAsync(Xamarin.Essentials.Location)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
@@ -40,7 +40,7 @@
     <Member MemberName="OpenAsync">
       <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenAsync (Xamarin.Essentials.Placemark placemark);" />
       <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenAsync(class Xamarin.Essentials.Placemark placemark) cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Maps.OpenAsync(Xamarin.Essentials.Placemark)" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Map.OpenAsync(Xamarin.Essentials.Placemark)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
@@ -62,7 +62,7 @@
     <Member MemberName="OpenAsync">
       <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenAsync (double latitude, double longitude);" />
       <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenAsync(float64 latitude, float64 longitude) cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Maps.OpenAsync(System.Double,System.Double)" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Map.OpenAsync(System.Double,System.Double)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
@@ -84,9 +84,9 @@
       </Docs>
     </Member>
     <Member MemberName="OpenAsync">
-      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenAsync (Xamarin.Essentials.Location location, Xamarin.Essentials.MapsLaunchOptions options);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenAsync(class Xamarin.Essentials.Location location, class Xamarin.Essentials.MapsLaunchOptions options) cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Maps.OpenAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapsLaunchOptions)" />
+      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenAsync (Xamarin.Essentials.Location location, Xamarin.Essentials.MapLaunchOptions options);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenAsync(class Xamarin.Essentials.Location location, class Xamarin.Essentials.MapLaunchOptions options) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Map.OpenAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapLaunchOptions)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
@@ -97,7 +97,7 @@
       </ReturnValue>
       <Parameters>
         <Parameter Name="location" Type="Xamarin.Essentials.Location" />
-        <Parameter Name="options" Type="Xamarin.Essentials.MapsLaunchOptions" />
+        <Parameter Name="options" Type="Xamarin.Essentials.MapLaunchOptions" />
       </Parameters>
       <Docs>
         <param name="location">Location to open maps to.</param>
@@ -108,9 +108,9 @@
       </Docs>
     </Member>
     <Member MemberName="OpenAsync">
-      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenAsync (Xamarin.Essentials.Placemark placemark, Xamarin.Essentials.MapsLaunchOptions options);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenAsync(class Xamarin.Essentials.Placemark placemark, class Xamarin.Essentials.MapsLaunchOptions options) cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Maps.OpenAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapsLaunchOptions)" />
+      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenAsync (Xamarin.Essentials.Placemark placemark, Xamarin.Essentials.MapLaunchOptions options);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenAsync(class Xamarin.Essentials.Placemark placemark, class Xamarin.Essentials.MapLaunchOptions options) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Map.OpenAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapLaunchOptions)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
@@ -121,7 +121,7 @@
       </ReturnValue>
       <Parameters>
         <Parameter Name="placemark" Type="Xamarin.Essentials.Placemark" />
-        <Parameter Name="options" Type="Xamarin.Essentials.MapsLaunchOptions" />
+        <Parameter Name="options" Type="Xamarin.Essentials.MapLaunchOptions" />
       </Parameters>
       <Docs>
         <param name="placemark">Placemark to open maps to.</param>
@@ -132,9 +132,9 @@
       </Docs>
     </Member>
     <Member MemberName="OpenAsync">
-      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenAsync (double latitude, double longitude, Xamarin.Essentials.MapsLaunchOptions options);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenAsync(float64 latitude, float64 longitude, class Xamarin.Essentials.MapsLaunchOptions options) cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Maps.OpenAsync(System.Double,System.Double,Xamarin.Essentials.MapsLaunchOptions)" />
+      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenAsync (double latitude, double longitude, Xamarin.Essentials.MapLaunchOptions options);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenAsync(float64 latitude, float64 longitude, class Xamarin.Essentials.MapLaunchOptions options) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Map.OpenAsync(System.Double,System.Double,Xamarin.Essentials.MapLaunchOptions)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
@@ -146,7 +146,7 @@
       <Parameters>
         <Parameter Name="latitude" Type="System.Double" />
         <Parameter Name="longitude" Type="System.Double" />
-        <Parameter Name="options" Type="Xamarin.Essentials.MapsLaunchOptions" />
+        <Parameter Name="options" Type="Xamarin.Essentials.MapLaunchOptions" />
       </Parameters>
       <Docs>
         <param name="latitude">Latitude to open to.</param>
diff --git a/docs/en/Xamarin.Essentials/MapsLaunchOptions.xml b/docs/en/Xamarin.Essentials/MapLaunchOptions.xml
similarity index 74%
rename from docs/en/Xamarin.Essentials/MapsLaunchOptions.xml
rename to docs/en/Xamarin.Essentials/MapLaunchOptions.xml
index f0959c61a..0f84727c8 100644
--- a/docs/en/Xamarin.Essentials/MapsLaunchOptions.xml
+++ b/docs/en/Xamarin.Essentials/MapLaunchOptions.xml
@@ -1,7 +1,7 @@
-<Type Name="MapsLaunchOptions" FullName="Xamarin.Essentials.MapsLaunchOptions">
-  <TypeSignature Language="C#" Value="public class MapsLaunchOptions" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit MapsLaunchOptions extends System.Object" />
-  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.MapsLaunchOptions" />
+<Type Name="MapLaunchOptions" FullName="Xamarin.Essentials.MapLaunchOptions">
+  <TypeSignature Language="C#" Value="public class MapLaunchOptions" />
+  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit MapLaunchOptions extends System.Object" />
+  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.MapLaunchOptions" />
   <AssemblyInfo>
     <AssemblyName>Xamarin.Essentials</AssemblyName>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -16,9 +16,9 @@
   </Docs>
   <Members>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public MapsLaunchOptions ();" />
+      <MemberSignature Language="C#" Value="public MapLaunchOptions ();" />
       <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.MapsLaunchOptions.#ctor" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.MapLaunchOptions.#ctor" />
       <MemberType>Constructor</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
@@ -30,42 +30,42 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
-    <Member MemberName="MapDirectionsMode">
-      <MemberSignature Language="C#" Value="public Xamarin.Essentials.MapDirectionsMode MapDirectionsMode { get; set; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Essentials.MapDirectionsMode MapDirectionsMode" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.MapsLaunchOptions.MapDirectionsMode" />
+    <Member MemberName="Name">
+      <MemberSignature Language="C#" Value="public string Name { get; set; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance string Name" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.MapLaunchOptions.Name" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>Xamarin.Essentials.MapDirectionsMode</ReturnType>
+        <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Directions mode to launch maps for navigation.</summary>
-        <value>Gets the mode.</value>
-        <remarks>
-          <para />
-        </remarks>
+        <summary>Name of destination to display to user.</summary>
+        <value>Gets the name.</value>
+        <remarks></remarks>
       </Docs>
     </Member>
-    <Member MemberName="Name">
-      <MemberSignature Language="C#" Value="public string Name { get; set; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance string Name" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.MapsLaunchOptions.Name" />
+    <Member MemberName="NavigationMode">
+      <MemberSignature Language="C#" Value="public Xamarin.Essentials.NavigationMode NavigationMode { get; set; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Essentials.NavigationMode NavigationMode" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.MapLaunchOptions.NavigationMode" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>System.String</ReturnType>
+        <ReturnType>Xamarin.Essentials.NavigationMode</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Name of destination to display to user.</summary>
-        <value>Gets the name.</value>
-        <remarks></remarks>
+        <summary>The navigation mode to use.</summary>
+        <value>Gets the navigation mode.</value>
+        <remarks>
+          <para />
+        </remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/Xamarin.Essentials/MapDirectionsMode.xml b/docs/en/Xamarin.Essentials/NavigationMode.xml
similarity index 70%
rename from docs/en/Xamarin.Essentials/MapDirectionsMode.xml
rename to docs/en/Xamarin.Essentials/NavigationMode.xml
index 2269f2804..10171bd08 100644
--- a/docs/en/Xamarin.Essentials/MapDirectionsMode.xml
+++ b/docs/en/Xamarin.Essentials/NavigationMode.xml
@@ -1,7 +1,7 @@
-<Type Name="MapDirectionsMode" FullName="Xamarin.Essentials.MapDirectionsMode">
-  <TypeSignature Language="C#" Value="public enum MapDirectionsMode" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed MapDirectionsMode extends System.Enum" />
-  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.MapDirectionsMode" />
+<Type Name="NavigationMode" FullName="Xamarin.Essentials.NavigationMode">
+  <TypeSignature Language="C#" Value="public enum NavigationMode" />
+  <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed NavigationMode extends System.Enum" />
+  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.NavigationMode" />
   <AssemblyInfo>
     <AssemblyName>Xamarin.Essentials</AssemblyName>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -10,7 +10,7 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Docs>
-    <summary>Directions mode for navigation.</summary>
+    <summary>Represents various modes of navigation.</summary>
     <remarks>
       <para>Default is none.</para>
     </remarks>
@@ -18,49 +18,49 @@
   <Members>
     <Member MemberName="Bicycling">
       <MemberSignature Language="C#" Value="Bicycling" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.MapDirectionsMode Bicycling = int32(1)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.MapDirectionsMode.Bicycling" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.NavigationMode Bicycling = int32(2)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.NavigationMode.Bicycling" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>Xamarin.Essentials.MapDirectionsMode</ReturnType>
+        <ReturnType>Xamarin.Essentials.NavigationMode</ReturnType>
       </ReturnValue>
-      <MemberValue>1</MemberValue>
+      <MemberValue>2</MemberValue>
       <Docs>
         <summary>Bicycle route mode.</summary>
       </Docs>
     </Member>
     <Member MemberName="Default">
       <MemberSignature Language="C#" Value="Default" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.MapDirectionsMode Default = int32(2)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.MapDirectionsMode.Default" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.NavigationMode Default = int32(1)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.NavigationMode.Default" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>Xamarin.Essentials.MapDirectionsMode</ReturnType>
+        <ReturnType>Xamarin.Essentials.NavigationMode</ReturnType>
       </ReturnValue>
-      <MemberValue>2</MemberValue>
+      <MemberValue>1</MemberValue>
       <Docs>
-        <summary>The default directions mode on the platform.</summary>
+        <summary>The default navigation mode on the platform.</summary>
       </Docs>
     </Member>
     <Member MemberName="Driving">
       <MemberSignature Language="C#" Value="Driving" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.MapDirectionsMode Driving = int32(3)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.MapDirectionsMode.Driving" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.NavigationMode Driving = int32(3)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.NavigationMode.Driving" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>Xamarin.Essentials.MapDirectionsMode</ReturnType>
+        <ReturnType>Xamarin.Essentials.NavigationMode</ReturnType>
       </ReturnValue>
       <MemberValue>3</MemberValue>
       <Docs>
@@ -69,32 +69,32 @@
     </Member>
     <Member MemberName="None">
       <MemberSignature Language="C#" Value="None" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.MapDirectionsMode None = int32(0)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.MapDirectionsMode.None" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.NavigationMode None = int32(0)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.NavigationMode.None" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>Xamarin.Essentials.MapDirectionsMode</ReturnType>
+        <ReturnType>Xamarin.Essentials.NavigationMode</ReturnType>
       </ReturnValue>
       <MemberValue>0</MemberValue>
       <Docs>
-        <summary>No directions mode for map.</summary>
+        <summary>No navigation mode for map.</summary>
       </Docs>
     </Member>
     <Member MemberName="Transit">
       <MemberSignature Language="C#" Value="Transit" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.MapDirectionsMode Transit = int32(4)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.MapDirectionsMode.Transit" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.NavigationMode Transit = int32(4)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.NavigationMode.Transit" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>Xamarin.Essentials.MapDirectionsMode</ReturnType>
+        <ReturnType>Xamarin.Essentials.NavigationMode</ReturnType>
       </ReturnValue>
       <MemberValue>4</MemberValue>
       <Docs>
@@ -103,15 +103,15 @@
     </Member>
     <Member MemberName="Walking">
       <MemberSignature Language="C#" Value="Walking" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.MapDirectionsMode Walking = int32(5)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.MapDirectionsMode.Walking" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.NavigationMode Walking = int32(5)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.NavigationMode.Walking" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>Xamarin.Essentials.MapDirectionsMode</ReturnType>
+        <ReturnType>Xamarin.Essentials.NavigationMode</ReturnType>
       </ReturnValue>
       <MemberValue>5</MemberValue>
       <Docs>
diff --git a/docs/en/Xamarin.Essentials/PlacemarkExtensions.xml b/docs/en/Xamarin.Essentials/PlacemarkExtensions.xml
index bcfc64612..25ac91ece 100644
--- a/docs/en/Xamarin.Essentials/PlacemarkExtensions.xml
+++ b/docs/en/Xamarin.Essentials/PlacemarkExtensions.xml
@@ -38,9 +38,9 @@
       </Docs>
     </Member>
     <Member MemberName="OpenMapsAsync">
-      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenMapsAsync (this Xamarin.Essentials.Placemark placemark, Xamarin.Essentials.MapsLaunchOptions options);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenMapsAsync(class Xamarin.Essentials.Placemark placemark, class Xamarin.Essentials.MapsLaunchOptions options) cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapsLaunchOptions)" />
+      <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenMapsAsync (this Xamarin.Essentials.Placemark placemark, Xamarin.Essentials.MapLaunchOptions options);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenMapsAsync(class Xamarin.Essentials.Placemark placemark, class Xamarin.Essentials.MapLaunchOptions options) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapLaunchOptions)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
@@ -51,7 +51,7 @@
       </ReturnValue>
       <Parameters>
         <Parameter Name="placemark" Type="Xamarin.Essentials.Placemark" RefType="this" />
-        <Parameter Name="options" Type="Xamarin.Essentials.MapsLaunchOptions" />
+        <Parameter Name="options" Type="Xamarin.Essentials.MapLaunchOptions" />
       </Parameters>
       <Docs>
         <param name="placemark">To be added.</param>
diff --git a/docs/en/index.xml b/docs/en/index.xml
index 3342399f3..b382713c4 100644
--- a/docs/en/index.xml
+++ b/docs/en/index.xml
@@ -78,7 +78,7 @@
           <AttributeName>System.Runtime.Versioning.TargetFramework(".NETCore,Version=v5.0", FrameworkDisplayName=".NET for Windows Universal")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyInformationalVersion("1.0.0+2d55930aa6f65dd776e5b74110ca27d6bb66a4df")</AttributeName>
+          <AttributeName>System.Reflection.AssemblyInformationalVersion("1.0.0+06f6e2b7c393a97f6c3d4b34bb339c7a1081e993")</AttributeName>
         </Attribute>
       </Attributes>
     </Assembly>
@@ -137,9 +137,9 @@
       <Type Name="MagnetometerChangedEventArgs" Kind="Class" />
       <Type Name="MagnetometerData" Kind="Structure" />
       <Type Name="MainThread" Kind="Class" />
-      <Type Name="MapDirectionsMode" Kind="Enumeration" />
-      <Type Name="Maps" Kind="Class" />
-      <Type Name="MapsLaunchOptions" Kind="Class" />
+      <Type Name="Map" Kind="Class" />
+      <Type Name="MapLaunchOptions" Kind="Class" />
+      <Type Name="NavigationMode" Kind="Enumeration" />
       <Type Name="NetworkAccess" Kind="Enumeration" />
       <Type Name="NotImplementedInReferenceAssemblyException" Kind="Class" />
       <Type Name="OrientationSensor" Kind="Class" />
@@ -251,23 +251,23 @@
         <Target Type="T:Xamarin.Essentials.Location" />
       </Targets>
       <Member MemberName="OpenMapsAsync">
-        <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenMapsAsync (this Xamarin.Essentials.Location location, Xamarin.Essentials.MapsLaunchOptions options);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenMapsAsync(class Xamarin.Essentials.Location location, class Xamarin.Essentials.MapsLaunchOptions options) cil managed" />
-        <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.LocationExtensions.OpenMapsAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapsLaunchOptions)" />
+        <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenMapsAsync (this Xamarin.Essentials.Location location, Xamarin.Essentials.MapLaunchOptions options);" />
+        <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenMapsAsync(class Xamarin.Essentials.Location location, class Xamarin.Essentials.MapLaunchOptions options) cil managed" />
+        <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.LocationExtensions.OpenMapsAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapLaunchOptions)" />
         <MemberType>ExtensionMethod</MemberType>
         <ReturnValue>
           <ReturnType>System.Threading.Tasks.Task</ReturnType>
         </ReturnValue>
         <Parameters>
           <Parameter Name="location" Type="Xamarin.Essentials.Location" RefType="this" />
-          <Parameter Name="options" Type="Xamarin.Essentials.MapsLaunchOptions" />
+          <Parameter Name="options" Type="Xamarin.Essentials.MapLaunchOptions" />
         </Parameters>
         <Docs>
           <param name="location">Location to open to.</param>
           <param name="options">Options to use.</param>
           <summary>Open maps to this location.</summary>
         </Docs>
-        <Link Type="Xamarin.Essentials.LocationExtensions" Member="M:Xamarin.Essentials.LocationExtensions.OpenMapsAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapsLaunchOptions)" />
+        <Link Type="Xamarin.Essentials.LocationExtensions" Member="M:Xamarin.Essentials.LocationExtensions.OpenMapsAsync(Xamarin.Essentials.Location,Xamarin.Essentials.MapLaunchOptions)" />
       </Member>
     </ExtensionMethod>
     <ExtensionMethod>
@@ -297,23 +297,23 @@
         <Target Type="T:Xamarin.Essentials.Placemark" />
       </Targets>
       <Member MemberName="OpenMapsAsync">
-        <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenMapsAsync (this Xamarin.Essentials.Placemark placemark, Xamarin.Essentials.MapsLaunchOptions options);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenMapsAsync(class Xamarin.Essentials.Placemark placemark, class Xamarin.Essentials.MapsLaunchOptions options) cil managed" />
-        <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapsLaunchOptions)" />
+        <MemberSignature Language="C#" Value="public static System.Threading.Tasks.Task OpenMapsAsync (this Xamarin.Essentials.Placemark placemark, Xamarin.Essentials.MapLaunchOptions options);" />
+        <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Threading.Tasks.Task OpenMapsAsync(class Xamarin.Essentials.Placemark placemark, class Xamarin.Essentials.MapLaunchOptions options) cil managed" />
+        <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapLaunchOptions)" />
         <MemberType>ExtensionMethod</MemberType>
         <ReturnValue>
           <ReturnType>System.Threading.Tasks.Task</ReturnType>
         </ReturnValue>
         <Parameters>
           <Parameter Name="placemark" Type="Xamarin.Essentials.Placemark" RefType="this" />
-          <Parameter Name="options" Type="Xamarin.Essentials.MapsLaunchOptions" />
+          <Parameter Name="options" Type="Xamarin.Essentials.MapLaunchOptions" />
         </Parameters>
         <Docs>
           <param name="placemark">To be added.</param>
           <param name="options">To be added.</param>
           <summary>To be added.</summary>
         </Docs>
-        <Link Type="Xamarin.Essentials.PlacemarkExtensions" Member="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapsLaunchOptions)" />
+        <Link Type="Xamarin.Essentials.PlacemarkExtensions" Member="M:Xamarin.Essentials.PlacemarkExtensions.OpenMapsAsync(Xamarin.Essentials.Placemark,Xamarin.Essentials.MapLaunchOptions)" />
       </Member>
     </ExtensionMethod>
   </ExtensionMethods>

From fcfa6fbd7fc4487e2aafc328ea6de51f43f02600 Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Mon, 5 Nov 2018 10:57:45 -0800
Subject: [PATCH 24/43] Refactor display info and keep screen on.

---
 .../DeviceTests.Shared/DeviceInfo_Tests.cs    |  46 ++++-
 .../DeviceTests.Shared/ScreenLock_Tests.cs    |  53 -----
 ...eenLockPage.xaml => KeepScreenOnPage.xaml} |   6 +-
 ...kPage.xaml.cs => KeepScreenOnPage.xaml.cs} |   4 +-
 .../Samples/ViewModel/DeviceInfoViewModel.cs  |  14 +-
 Samples/Samples/ViewModel/HomeViewModel.cs    |  12 +-
 ...kViewModel.cs => KeepScreenOnViewModel.cs} |  10 +-
 Tests/DeviceDisplay_Tests.cs                  |  30 +--
 .../DeviceDisplay/DeviceDisplay.android.cs    |  56 ++++--
 .../DeviceDisplay/DeviceDisplay.ios.cs        |  33 ++--
 .../DeviceDisplay.netstandard.cs              |   8 +-
 .../DeviceDisplay/DeviceDisplay.shared.cs     | 114 +++--------
 .../DeviceDisplay/DeviceDisplay.uwp.cs        |  78 ++++++--
 .../ScreenLock/ScreenLock.android.cs          |  29 ---
 .../ScreenLock/ScreenLock.ios.cs              |  16 --
 .../ScreenLock/ScreenLock.netstandard.cs      |  14 --
 .../ScreenLock/ScreenLock.shared.cs           |  11 --
 .../ScreenLock/ScreenLock.uwp.cs              |  45 -----
 .../Types/DisplayInfo.shared.cs               |  51 +++++
 .../Types/DisplayOrientation.shared.cs        |   9 +
 .../Types/DisplayRotation.shared.cs           |  11 ++
 .../xamarin-essentials-android.xml            |  68 ++++---
 .../xamarin-essentials-ios.xml                |  68 ++++---
 .../xamarin-essentials-uwp.xml                |  68 ++++---
 .../en/FrameworksIndex/xamarin-essentials.xml |  68 ++++---
 .../{ScreenMetrics.xml => DisplayInfo.xml}    | 184 +++++++++++-------
 ...Orientation.xml => DisplayOrientation.xml} |  42 ++--
 ...ScreenRotation.xml => DisplayRotation.xml} |  69 ++++---
 .../MainDisplayInfoChangedEventArgs.xml       |  57 ++++++
 docs/en/Xamarin.Essentials/ScreenLock.xml     |  73 -------
 .../ScreenMetricsChangedEventArgs.xml         |  61 ------
 docs/en/index.xml                             |   9 +-
 32 files changed, 670 insertions(+), 747 deletions(-)
 delete mode 100644 DeviceTests/DeviceTests.Shared/ScreenLock_Tests.cs
 rename Samples/Samples/View/{ScreenLockPage.xaml => KeepScreenOnPage.xaml} (88%)
 rename Samples/Samples/View/{ScreenLockPage.xaml.cs => KeepScreenOnPage.xaml.cs} (52%)
 rename Samples/Samples/ViewModel/{ScreenLockViewModel.cs => KeepScreenOnViewModel.cs} (70%)
 delete mode 100644 Xamarin.Essentials/ScreenLock/ScreenLock.android.cs
 delete mode 100644 Xamarin.Essentials/ScreenLock/ScreenLock.ios.cs
 delete mode 100644 Xamarin.Essentials/ScreenLock/ScreenLock.netstandard.cs
 delete mode 100644 Xamarin.Essentials/ScreenLock/ScreenLock.shared.cs
 delete mode 100644 Xamarin.Essentials/ScreenLock/ScreenLock.uwp.cs
 create mode 100644 Xamarin.Essentials/Types/DisplayInfo.shared.cs
 create mode 100644 Xamarin.Essentials/Types/DisplayOrientation.shared.cs
 create mode 100644 Xamarin.Essentials/Types/DisplayRotation.shared.cs
 rename docs/en/Xamarin.Essentials/{ScreenMetrics.xml => DisplayInfo.xml} (59%)
 rename docs/en/Xamarin.Essentials/{ScreenOrientation.xml => DisplayOrientation.xml} (63%)
 rename docs/en/Xamarin.Essentials/{ScreenRotation.xml => DisplayRotation.xml} (58%)
 create mode 100644 docs/en/Xamarin.Essentials/MainDisplayInfoChangedEventArgs.xml
 delete mode 100644 docs/en/Xamarin.Essentials/ScreenLock.xml
 delete mode 100644 docs/en/Xamarin.Essentials/ScreenMetricsChangedEventArgs.xml

diff --git a/DeviceTests/DeviceTests.Shared/DeviceInfo_Tests.cs b/DeviceTests/DeviceTests.Shared/DeviceInfo_Tests.cs
index a80220f85..871d28524 100644
--- a/DeviceTests/DeviceTests.Shared/DeviceInfo_Tests.cs
+++ b/DeviceTests/DeviceTests.Shared/DeviceInfo_Tests.cs
@@ -96,12 +96,56 @@ public Task Screen_Metrics_Are_Not_Null()
         {
             return Utils.OnMainThread(() =>
             {
-                var metrics = DeviceDisplay.ScreenMetrics;
+                var metrics = DeviceDisplay.MainDisplayInfo;
 
                 Assert.True(metrics.Width > 0);
                 Assert.True(metrics.Height > 0);
                 Assert.True(metrics.Density > 0);
             });
         }
+
+        [Fact]
+        public Task ScreenLock_Locks()
+        {
+            return Utils.OnMainThread(() =>
+            {
+                Assert.False(DeviceDisplay.KeepScreenOn);
+
+                DeviceDisplay.KeepScreenOn = true;
+                Assert.True(DeviceDisplay.KeepScreenOn);
+
+                DeviceDisplay.KeepScreenOn = false;
+                Assert.False(DeviceDisplay.KeepScreenOn);
+            });
+        }
+
+        [Fact]
+        public Task ScreenLock_Unlocks_Without_Locking()
+        {
+            return Utils.OnMainThread(() =>
+            {
+                Assert.False(DeviceDisplay.KeepScreenOn);
+
+                DeviceDisplay.KeepScreenOn = false;
+                Assert.False(DeviceDisplay.KeepScreenOn);
+            });
+        }
+
+        [Fact]
+        public Task ScreenLock_Locks_Only_Once()
+        {
+            return Utils.OnMainThread(() =>
+            {
+                Assert.False(DeviceDisplay.KeepScreenOn);
+
+                DeviceDisplay.KeepScreenOn = true;
+                Assert.True(DeviceDisplay.KeepScreenOn);
+                DeviceDisplay.KeepScreenOn = true;
+                Assert.True(DeviceDisplay.KeepScreenOn);
+
+                DeviceDisplay.KeepScreenOn = false;
+                Assert.False(DeviceDisplay.KeepScreenOn);
+            });
+        }
     }
 }
diff --git a/DeviceTests/DeviceTests.Shared/ScreenLock_Tests.cs b/DeviceTests/DeviceTests.Shared/ScreenLock_Tests.cs
deleted file mode 100644
index b212cc561..000000000
--- a/DeviceTests/DeviceTests.Shared/ScreenLock_Tests.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System.Threading.Tasks;
-using Xamarin.Essentials;
-using Xunit;
-
-namespace DeviceTests
-{
-    public class ScreenLock_Tests
-    {
-        [Fact]
-        public Task ScreenLock_Locks()
-        {
-            return Utils.OnMainThread(() =>
-            {
-                Assert.False(ScreenLock.IsActive);
-
-                ScreenLock.RequestActive();
-                Assert.True(ScreenLock.IsActive);
-
-                ScreenLock.RequestRelease();
-                Assert.False(ScreenLock.IsActive);
-            });
-        }
-
-        [Fact]
-        public Task ScreenLock_Unlocks_Without_Locking()
-        {
-            return Utils.OnMainThread(() =>
-            {
-                Assert.False(ScreenLock.IsActive);
-
-                ScreenLock.RequestRelease();
-                Assert.False(ScreenLock.IsActive);
-            });
-        }
-
-        [Fact]
-        public Task ScreenLock_Locks_Only_Once()
-        {
-            return Utils.OnMainThread(() =>
-            {
-                Assert.False(ScreenLock.IsActive);
-
-                ScreenLock.RequestActive();
-                Assert.True(ScreenLock.IsActive);
-                ScreenLock.RequestActive();
-                Assert.True(ScreenLock.IsActive);
-
-                ScreenLock.RequestRelease();
-                Assert.False(ScreenLock.IsActive);
-            });
-        }
-    }
-}
diff --git a/Samples/Samples/View/ScreenLockPage.xaml b/Samples/Samples/View/KeepScreenOnPage.xaml
similarity index 88%
rename from Samples/Samples/View/ScreenLockPage.xaml
rename to Samples/Samples/View/KeepScreenOnPage.xaml
index 456d48bb2..52f928702 100644
--- a/Samples/Samples/View/ScreenLockPage.xaml
+++ b/Samples/Samples/View/KeepScreenOnPage.xaml
@@ -2,10 +2,10 @@
                 xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                 xmlns:views="clr-namespace:Samples.View"
                 xmlns:viewmodels="clr-namespace:Samples.ViewModel"
-                x:Class="Samples.View.ScreenLockPage"
-                Title="Screen Lock">
+                x:Class="Samples.View.KeepScreenOnPage"
+                Title="Keep Screen On">
     <views:BasePage.BindingContext>
-        <viewmodels:ScreenLockViewModel />
+        <viewmodels:KeepScreenOnViewModel />
     </views:BasePage.BindingContext>
 
     <StackLayout>
diff --git a/Samples/Samples/View/ScreenLockPage.xaml.cs b/Samples/Samples/View/KeepScreenOnPage.xaml.cs
similarity index 52%
rename from Samples/Samples/View/ScreenLockPage.xaml.cs
rename to Samples/Samples/View/KeepScreenOnPage.xaml.cs
index fa138a9d0..2afcb7282 100644
--- a/Samples/Samples/View/ScreenLockPage.xaml.cs
+++ b/Samples/Samples/View/KeepScreenOnPage.xaml.cs
@@ -1,8 +1,8 @@
 namespace Samples.View
 {
-    public partial class ScreenLockPage : BasePage
+    public partial class KeepScreenOnPage : BasePage
     {
-        public ScreenLockPage()
+        public KeepScreenOnPage()
         {
             InitializeComponent();
         }
diff --git a/Samples/Samples/ViewModel/DeviceInfoViewModel.cs b/Samples/Samples/ViewModel/DeviceInfoViewModel.cs
index ffdf67e6b..30df56e47 100644
--- a/Samples/Samples/ViewModel/DeviceInfoViewModel.cs
+++ b/Samples/Samples/ViewModel/DeviceInfoViewModel.cs
@@ -4,7 +4,7 @@ namespace Samples.ViewModel
 {
     public class DeviceInfoViewModel : BaseViewModel
     {
-        ScreenMetrics screenMetrics;
+        DisplayInfo screenMetrics;
 
         public string Model => DeviceInfo.Model;
 
@@ -22,7 +22,7 @@ public class DeviceInfoViewModel : BaseViewModel
 
         public DeviceType DeviceType => DeviceInfo.DeviceType;
 
-        public ScreenMetrics ScreenMetrics
+        public DisplayInfo ScreenMetrics
         {
             get => screenMetrics;
             set => SetProperty(ref screenMetrics, value);
@@ -32,20 +32,20 @@ public override void OnAppearing()
         {
             base.OnAppearing();
 
-            DeviceDisplay.ScreenMetricsChanged += OnScreenMetricsChanged;
-            ScreenMetrics = DeviceDisplay.ScreenMetrics;
+            DeviceDisplay.MainDisplayInfoChanged += OnScreenMetricsChanged;
+            ScreenMetrics = DeviceDisplay.MainDisplayInfo;
         }
 
         public override void OnDisappearing()
         {
-            DeviceDisplay.ScreenMetricsChanged -= OnScreenMetricsChanged;
+            DeviceDisplay.MainDisplayInfoChanged -= OnScreenMetricsChanged;
 
             base.OnDisappearing();
         }
 
-        void OnScreenMetricsChanged(object sender, ScreenMetricsChangedEventArgs e)
+        void OnScreenMetricsChanged(object sender, MainDisplayInfoChangedEventArgs e)
         {
-            ScreenMetrics = e.Metrics;
+            ScreenMetrics = e.MainDisplayInfo;
         }
     }
 }
diff --git a/Samples/Samples/ViewModel/HomeViewModel.cs b/Samples/Samples/ViewModel/HomeViewModel.cs
index d613eae50..18612963e 100644
--- a/Samples/Samples/ViewModel/HomeViewModel.cs
+++ b/Samples/Samples/ViewModel/HomeViewModel.cs
@@ -108,6 +108,12 @@ public HomeViewModel()
                     typeof(GeolocationPage),
                     "Quickly get the current location.",
                     new[] { "geolocation", "position", "address", "mapping" }),
+                new SampleItem(
+                    "💤",
+                    "Keep Screen On",
+                    typeof(KeepScreenOnPage),
+                    "Keep the device screen awake.",
+                    new[] { "screen", "awake", "sleep" }),
                 new SampleItem(
                     "📏",
                     "Launcher",
@@ -150,12 +156,6 @@ public HomeViewModel()
                     typeof(PreferencesPage),
                     "Quickly and easily add persistent preferences.",
                     new[] { "settings", "preferences", "prefs", "storage" }),
-                new SampleItem(
-                    "💤",
-                    "Screen Lock",
-                    typeof(ScreenLockPage),
-                    "Keep the device screen awake.",
-                    new[] { "screen", "awake", "sleep" }),
                 new SampleItem(
                     "🔒",
                     "Secure Storage",
diff --git a/Samples/Samples/ViewModel/ScreenLockViewModel.cs b/Samples/Samples/ViewModel/KeepScreenOnViewModel.cs
similarity index 70%
rename from Samples/Samples/ViewModel/ScreenLockViewModel.cs
rename to Samples/Samples/ViewModel/KeepScreenOnViewModel.cs
index cf3edf2b3..b4c12b1c2 100644
--- a/Samples/Samples/ViewModel/ScreenLockViewModel.cs
+++ b/Samples/Samples/ViewModel/KeepScreenOnViewModel.cs
@@ -4,15 +4,15 @@
 
 namespace Samples.ViewModel
 {
-    public class ScreenLockViewModel : BaseViewModel
+    public class KeepScreenOnViewModel : BaseViewModel
     {
-        public ScreenLockViewModel()
+        public KeepScreenOnViewModel()
         {
             RequestActiveCommand = new Command(OnRequestActive);
             RequestReleaseCommand = new Command(OnRequestRelease);
         }
 
-        public bool IsActive => ScreenLock.IsActive;
+        public bool IsActive => DeviceDisplay.KeepScreenOn;
 
         public ICommand RequestActiveCommand { get; }
 
@@ -20,14 +20,14 @@ public ScreenLockViewModel()
 
         void OnRequestActive()
         {
-            ScreenLock.RequestActive();
+            DeviceDisplay.KeepScreenOn = true;
 
             OnPropertyChanged(nameof(IsActive));
         }
 
         void OnRequestRelease()
         {
-            ScreenLock.RequestRelease();
+            DeviceDisplay.KeepScreenOn = false;
 
             OnPropertyChanged(nameof(IsActive));
         }
diff --git a/Tests/DeviceDisplay_Tests.cs b/Tests/DeviceDisplay_Tests.cs
index 3b3173087..985b7a131 100644
--- a/Tests/DeviceDisplay_Tests.cs
+++ b/Tests/DeviceDisplay_Tests.cs
@@ -6,36 +6,36 @@ namespace Tests
     public class DeviceDisplay_Tests
     {
         [Theory]
-        [InlineData(0.0, 0.0, 0.0, ScreenOrientation.Landscape, ScreenRotation.Rotation0, 0.0, 0.0, 0.0, ScreenOrientation.Landscape, ScreenRotation.Rotation0, true)]
-        [InlineData(1.1, 0.0, 0.0, ScreenOrientation.Landscape, ScreenRotation.Rotation0, 1.1, 0.0, 0.0, ScreenOrientation.Landscape, ScreenRotation.Rotation0, true)]
-        [InlineData(0.0, 0.0, 0.0, ScreenOrientation.Portrait, ScreenRotation.Rotation0, 0.0, 0.0, 0.0, ScreenOrientation.Portrait, ScreenRotation.Rotation0, true)]
-        [InlineData(1.1, 0.0, 2.2, ScreenOrientation.Landscape, ScreenRotation.Rotation180, 1.1, 0.0, 2.2, ScreenOrientation.Landscape, ScreenRotation.Rotation180, true)]
-        [InlineData(1.0, 0.0, 0.0, ScreenOrientation.Landscape, ScreenRotation.Rotation0, 0.0, 0.0, 0.0, ScreenOrientation.Landscape, ScreenRotation.Rotation0, false)]
-        [InlineData(0.0, 1.0, 0.0, ScreenOrientation.Landscape, ScreenRotation.Rotation0, 0.0, 0.0, 0.0, ScreenOrientation.Landscape, ScreenRotation.Rotation0, false)]
-        [InlineData(0.0, 0.0, 1.0, ScreenOrientation.Landscape, ScreenRotation.Rotation0, 0.0, 0.0, 0.0, ScreenOrientation.Landscape, ScreenRotation.Rotation0, false)]
-        [InlineData(0.0, 0.0, 0.0, ScreenOrientation.Portrait, ScreenRotation.Rotation0, 0.0, 0.0, 0.0, ScreenOrientation.Landscape, ScreenRotation.Rotation0, false)]
-        [InlineData(1.0, 0.0, 0.0, ScreenOrientation.Landscape, ScreenRotation.Rotation180, 0.0, 0.0, 0.0, ScreenOrientation.Landscape, ScreenRotation.Rotation0, false)]
+        [InlineData(0.0, 0.0, 0.0, DisplayOrientation.Landscape, DisplayRotation.Rotation0, 0.0, 0.0, 0.0, DisplayOrientation.Landscape, DisplayRotation.Rotation0, true)]
+        [InlineData(1.1, 0.0, 0.0, DisplayOrientation.Landscape, DisplayRotation.Rotation0, 1.1, 0.0, 0.0, DisplayOrientation.Landscape, DisplayRotation.Rotation0, true)]
+        [InlineData(0.0, 0.0, 0.0, DisplayOrientation.Portrait, DisplayRotation.Rotation0, 0.0, 0.0, 0.0, DisplayOrientation.Portrait, DisplayRotation.Rotation0, true)]
+        [InlineData(1.1, 0.0, 2.2, DisplayOrientation.Landscape, DisplayRotation.Rotation180, 1.1, 0.0, 2.2, DisplayOrientation.Landscape, DisplayRotation.Rotation180, true)]
+        [InlineData(1.0, 0.0, 0.0, DisplayOrientation.Landscape, DisplayRotation.Rotation0, 0.0, 0.0, 0.0, DisplayOrientation.Landscape, DisplayRotation.Rotation0, false)]
+        [InlineData(0.0, 1.0, 0.0, DisplayOrientation.Landscape, DisplayRotation.Rotation0, 0.0, 0.0, 0.0, DisplayOrientation.Landscape, DisplayRotation.Rotation0, false)]
+        [InlineData(0.0, 0.0, 1.0, DisplayOrientation.Landscape, DisplayRotation.Rotation0, 0.0, 0.0, 0.0, DisplayOrientation.Landscape, DisplayRotation.Rotation0, false)]
+        [InlineData(0.0, 0.0, 0.0, DisplayOrientation.Portrait, DisplayRotation.Rotation0, 0.0, 0.0, 0.0, DisplayOrientation.Landscape, DisplayRotation.Rotation0, false)]
+        [InlineData(1.0, 0.0, 0.0, DisplayOrientation.Landscape, DisplayRotation.Rotation180, 0.0, 0.0, 0.0, DisplayOrientation.Landscape, DisplayRotation.Rotation0, false)]
         public void DeviceDisplay_Comparison(
            double width1,
            double height1,
            double density1,
-           ScreenOrientation orientation1,
-           ScreenRotation rotation1,
+           DisplayOrientation orientation1,
+           DisplayRotation rotation1,
            double width2,
            double height2,
            double density2,
-           ScreenOrientation orientation2,
-           ScreenRotation rotation2,
+           DisplayOrientation orientation2,
+           DisplayRotation rotation2,
            bool equals)
         {
-            var device1 = new ScreenMetrics(
+            var device1 = new DisplayInfo(
                 width: width1,
                 height: height1,
                 density: density1,
                 orientation: orientation1,
                 rotation: rotation1);
 
-            var device2 = new ScreenMetrics(
+            var device2 = new DisplayInfo(
                 width: width2,
                 height: height2,
                 density: density2,
diff --git a/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.android.cs b/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.android.cs
index fd1fb14ae..d01703b5e 100644
--- a/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.android.cs
+++ b/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.android.cs
@@ -1,8 +1,6 @@
 using System;
-using Android.App;
 using Android.Content;
 using Android.Content.Res;
-using Android.OS;
 using Android.Provider;
 using Android.Runtime;
 using Android.Views;
@@ -13,11 +11,30 @@ public static partial class DeviceDisplay
     {
         static OrientationEventListener orientationListener;
 
-        static ScreenMetrics GetScreenMetrics()
+        static bool PlatformKeepScreenOn
+        {
+            get
+            {
+                var window = Platform.GetCurrentActivity(true)?.Window;
+                var flags = window?.Attributes?.Flags ?? 0;
+                return flags.HasFlag(WindowManagerFlags.KeepScreenOn);
+            }
+
+            set
+            {
+                var window = Platform.GetCurrentActivity(true)?.Window;
+                if (value)
+                    window?.AddFlags(WindowManagerFlags.KeepScreenOn);
+                else
+                    window?.ClearFlags(WindowManagerFlags.KeepScreenOn);
+            }
+        }
+
+        static DisplayInfo GetMainDisplayInfo()
         {
             var displayMetrics = Platform.AppContext.Resources?.DisplayMetrics;
 
-            return new ScreenMetrics(
+            return new DisplayInfo(
                 width: displayMetrics?.WidthPixels ?? 0,
                 height: displayMetrics?.HeightPixels ?? 0,
                 density: displayMetrics?.Density ?? 0,
@@ -40,11 +57,11 @@ static void StopScreenMetricsListeners()
 
         static void OnScreenMetricsChanged()
         {
-            var metrics = GetScreenMetrics();
-            OnScreenMetricsChanged(metrics);
+            var metrics = GetMainDisplayInfo();
+            OnMainDisplayInfoChanged(metrics);
         }
 
-        static ScreenRotation CalculateRotation()
+        static DisplayRotation CalculateRotation()
         {
             var service = Platform.AppContext.GetSystemService(Context.WindowService);
             var display = service?.JavaCast<IWindowManager>()?.DefaultDisplay;
@@ -54,20 +71,20 @@ static ScreenRotation CalculateRotation()
                 switch (display.Rotation)
                 {
                     case SurfaceOrientation.Rotation270:
-                        return ScreenRotation.Rotation270;
+                        return DisplayRotation.Rotation270;
                     case SurfaceOrientation.Rotation180:
-                        return ScreenRotation.Rotation180;
+                        return DisplayRotation.Rotation180;
                     case SurfaceOrientation.Rotation90:
-                        return ScreenRotation.Rotation90;
+                        return DisplayRotation.Rotation90;
                     case SurfaceOrientation.Rotation0:
-                        return ScreenRotation.Rotation0;
+                        return DisplayRotation.Rotation0;
                 }
             }
 
-            return ScreenRotation.Rotation0;
+            return DisplayRotation.Unknown;
         }
 
-        static ScreenOrientation CalculateOrientation()
+        static DisplayOrientation CalculateOrientation()
         {
             var config = Platform.AppContext.Resources?.Configuration;
 
@@ -76,14 +93,14 @@ static ScreenOrientation CalculateOrientation()
                 switch (config.Orientation)
                 {
                     case Orientation.Landscape:
-                        return ScreenOrientation.Landscape;
+                        return DisplayOrientation.Landscape;
                     case Orientation.Portrait:
                     case Orientation.Square:
-                        return ScreenOrientation.Portrait;
+                        return DisplayOrientation.Portrait;
                 }
             }
 
-            return ScreenOrientation.Unknown;
+            return DisplayOrientation.Unknown;
         }
 
         static string GetSystemSetting(string name)
@@ -92,13 +109,10 @@ static string GetSystemSetting(string name)
 
     class Listener : OrientationEventListener
     {
-        Action onChanged;
+        readonly Action onChanged;
 
         internal Listener(Context context, Action handler)
-            : base(context)
-        {
-            onChanged = handler;
-        }
+            : base(context) => onChanged = handler;
 
         public override void OnOrientationChanged(int orientation) => onChanged();
     }
diff --git a/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.ios.cs b/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.ios.cs
index 30d0eb156..5ef3de6b4 100644
--- a/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.ios.cs
+++ b/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.ios.cs
@@ -1,5 +1,4 @@
 using Foundation;
-using ObjCRuntime;
 using UIKit;
 
 namespace Xamarin.Essentials
@@ -8,12 +7,18 @@ public static partial class DeviceDisplay
     {
         static NSObject observer;
 
-        static ScreenMetrics GetScreenMetrics()
+        static bool PlatformKeepScreenOn
+        {
+            get => UIApplication.SharedApplication.IdleTimerDisabled;
+            set => UIApplication.SharedApplication.IdleTimerDisabled = value;
+        }
+
+        static DisplayInfo GetMainDisplayInfo()
         {
             var bounds = UIScreen.MainScreen.Bounds;
             var scale = UIScreen.MainScreen.Scale;
 
-            return new ScreenMetrics(
+            return new DisplayInfo(
                 width: bounds.Width * scale,
                 height: bounds.Height * scale,
                 density: scale,
@@ -36,37 +41,37 @@ static void StopScreenMetricsListeners()
 
         static void OnScreenMetricsChanged(NSNotification obj)
         {
-            var metrics = GetScreenMetrics();
-            OnScreenMetricsChanged(metrics);
+            var metrics = GetMainDisplayInfo();
+            OnMainDisplayInfoChanged(metrics);
         }
 
-        static ScreenOrientation CalculateOrientation()
+        static DisplayOrientation CalculateOrientation()
         {
             var orientation = UIApplication.SharedApplication.StatusBarOrientation;
 
             if (orientation.IsLandscape())
-                return ScreenOrientation.Landscape;
+                return DisplayOrientation.Landscape;
 
-            return ScreenOrientation.Portrait;
+            return DisplayOrientation.Portrait;
         }
 
-        static ScreenRotation CalculateRotation()
+        static DisplayRotation CalculateRotation()
         {
             var orientation = UIApplication.SharedApplication.StatusBarOrientation;
 
             switch (orientation)
             {
                 case UIInterfaceOrientation.Portrait:
-                    return ScreenRotation.Rotation0;
+                    return DisplayRotation.Rotation0;
                 case UIInterfaceOrientation.PortraitUpsideDown:
-                    return ScreenRotation.Rotation180;
+                    return DisplayRotation.Rotation180;
                 case UIInterfaceOrientation.LandscapeLeft:
-                    return ScreenRotation.Rotation270;
+                    return DisplayRotation.Rotation270;
                 case UIInterfaceOrientation.LandscapeRight:
-                    return ScreenRotation.Rotation90;
+                    return DisplayRotation.Rotation90;
             }
 
-            return ScreenRotation.Rotation0;
+            return DisplayRotation.Unknown;
         }
     }
 }
diff --git a/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.netstandard.cs b/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.netstandard.cs
index 4a6ee8647..0b44c8c2d 100644
--- a/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.netstandard.cs
+++ b/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.netstandard.cs
@@ -2,7 +2,13 @@
 {
     public static partial class DeviceDisplay
     {
-        static ScreenMetrics GetScreenMetrics() => throw new NotImplementedInReferenceAssemblyException();
+        static bool PlatformKeepScreenOn
+        {
+            get => throw new NotImplementedInReferenceAssemblyException();
+            set => throw new NotImplementedInReferenceAssemblyException();
+        }
+
+        static DisplayInfo GetMainDisplayInfo() => throw new NotImplementedInReferenceAssemblyException();
 
         static void StartScreenMetricsListeners() => throw new NotImplementedInReferenceAssemblyException();
 
diff --git a/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.shared.cs b/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.shared.cs
index cf878627e..c06d05dbb 100644
--- a/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.shared.cs
+++ b/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.shared.cs
@@ -4,121 +4,65 @@ namespace Xamarin.Essentials
 {
     public static partial class DeviceDisplay
     {
-        static event EventHandler<ScreenMetricsChangedEventArgs> ScreenMetricsChangedInternal;
+        static event EventHandler<MainDisplayInfoChangedEventArgs> MainDisplayInfoChangedInternal;
 
-        static ScreenMetrics currentMetrics;
+        static DisplayInfo currentMetrics;
 
-        public static ScreenMetrics ScreenMetrics => GetScreenMetrics();
+        public static bool KeepScreenOn
+        {
+            get => PlatformKeepScreenOn;
+            set => PlatformKeepScreenOn = value;
+        }
 
-        static void SetCurrent(ScreenMetrics metrics) =>
-            currentMetrics = new ScreenMetrics(metrics.Width, metrics.Height, metrics.Density, metrics.Orientation, metrics.Rotation);
+        public static DisplayInfo MainDisplayInfo => GetMainDisplayInfo();
 
-        public static event EventHandler<ScreenMetricsChangedEventArgs> ScreenMetricsChanged
+        static void SetCurrent(DisplayInfo metrics) =>
+            currentMetrics = new DisplayInfo(metrics.Width, metrics.Height, metrics.Density, metrics.Orientation, metrics.Rotation);
+
+        public static event EventHandler<MainDisplayInfoChangedEventArgs> MainDisplayInfoChanged
         {
             add
             {
-                var wasRunning = ScreenMetricsChangedInternal != null;
+                var wasRunning = MainDisplayInfoChangedInternal != null;
 
-                ScreenMetricsChangedInternal += value;
+                MainDisplayInfoChangedInternal += value;
 
-                if (!wasRunning && ScreenMetricsChangedInternal != null)
+                if (!wasRunning && MainDisplayInfoChangedInternal != null)
                 {
-                    SetCurrent(GetScreenMetrics());
+                    SetCurrent(GetMainDisplayInfo());
                     StartScreenMetricsListeners();
                 }
             }
 
             remove
             {
-                var wasRunning = ScreenMetricsChangedInternal != null;
+                var wasRunning = MainDisplayInfoChangedInternal != null;
 
-                ScreenMetricsChangedInternal -= value;
+                MainDisplayInfoChangedInternal -= value;
 
-                if (wasRunning && ScreenMetricsChangedInternal == null)
+                if (wasRunning && MainDisplayInfoChangedInternal == null)
                     StopScreenMetricsListeners();
             }
         }
 
-        static void OnScreenMetricsChanged(ScreenMetrics metrics)
-            => OnScreenMetricsChanged(new ScreenMetricsChangedEventArgs(metrics));
+        static void OnMainDisplayInfoChanged(DisplayInfo metrics)
+            => OnMainDisplayInfoChanged(new MainDisplayInfoChangedEventArgs(metrics));
 
-        static void OnScreenMetricsChanged(ScreenMetricsChangedEventArgs e)
+        static void OnMainDisplayInfoChanged(MainDisplayInfoChangedEventArgs e)
         {
-            if (!currentMetrics.Equals(e.Metrics))
+            if (!currentMetrics.Equals(e.MainDisplayInfo))
             {
-                SetCurrent(e.Metrics);
-                ScreenMetricsChangedInternal?.Invoke(null, e);
+                SetCurrent(e.MainDisplayInfo);
+                MainDisplayInfoChangedInternal?.Invoke(null, e);
             }
         }
     }
 
-    public class ScreenMetricsChangedEventArgs : EventArgs
-    {
-        public ScreenMetricsChangedEventArgs(ScreenMetrics metrics) =>
-            Metrics = metrics;
-
-        public ScreenMetrics Metrics { get; }
-    }
-
-    [Preserve(AllMembers = true)]
-    public readonly struct ScreenMetrics : IEquatable<ScreenMetrics>
+    public class MainDisplayInfoChangedEventArgs : EventArgs
     {
-        internal ScreenMetrics(double width, double height, double density, ScreenOrientation orientation, ScreenRotation rotation)
-        {
-            Width = width;
-            Height = height;
-            Density = density;
-            Orientation = orientation;
-            Rotation = rotation;
-        }
-
-        public double Width { get; }
-
-        public double Height { get; }
-
-        public double Density { get; }
-
-        public ScreenOrientation Orientation { get; }
+        public MainDisplayInfoChangedEventArgs(DisplayInfo mainDisplayInfo) =>
+            MainDisplayInfo = mainDisplayInfo;
 
-        public ScreenRotation Rotation { get; }
-
-        public static bool operator ==(ScreenMetrics left, ScreenMetrics right) =>
-            Equals(left, right);
-
-        public static bool operator !=(ScreenMetrics left, ScreenMetrics right) =>
-            !Equals(left, right);
-
-        public override bool Equals(object obj) =>
-            (obj is ScreenMetrics metrics) && Equals(metrics);
-
-        public bool Equals(ScreenMetrics other) =>
-            Width.Equals(other.Width) &&
-            Height.Equals(other.Height) &&
-            Density.Equals(other.Density) &&
-            Orientation.Equals(other.Orientation) &&
-            Rotation.Equals(other.Rotation);
-
-        public override int GetHashCode() =>
-            (Height, Width, Density, Orientation, Rotation).GetHashCode();
-
-        public override string ToString() =>
-            $"{nameof(Height)}: {Height}, {nameof(Width)}: {Width}, " +
-            $"{nameof(Density)}: {Density}, {nameof(Orientation)}: {Orientation}, " +
-            $"{nameof(Rotation)}: {Rotation}";
-    }
-
-    public enum ScreenOrientation
-    {
-        Unknown,
-        Portrait,
-        Landscape
-    }
-
-    public enum ScreenRotation
-    {
-        Rotation0,
-        Rotation90,
-        Rotation180,
-        Rotation270
+        public DisplayInfo MainDisplayInfo { get; }
     }
 }
diff --git a/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.uwp.cs b/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.uwp.cs
index ab51daabc..328055374 100644
--- a/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.uwp.cs
+++ b/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.uwp.cs
@@ -1,22 +1,60 @@
 using Windows.Graphics.Display;
+using Windows.System.Display;
 
 namespace Xamarin.Essentials
 {
     public static partial class DeviceDisplay
     {
-        static ScreenMetrics GetScreenMetrics(DisplayInformation di = null)
+        static readonly object locker = new object();
+        static DisplayRequest displayRequest;
+
+        static bool PlatformKeepScreenOn
+        {
+            get
+            {
+                lock (locker)
+                {
+                    return displayRequest != null;
+                }
+            }
+
+            set
+            {
+                lock (locker)
+                {
+                    if (value)
+                    {
+                        if (displayRequest == null)
+                        {
+                            displayRequest = new DisplayRequest();
+                            displayRequest.RequestActive();
+                        }
+                    }
+                    else
+                    {
+                        if (displayRequest != null)
+                        {
+                            displayRequest.RequestRelease();
+                            displayRequest = null;
+                        }
+                    }
+                }
+            }
+        }
+
+        static DisplayInfo GetMainDisplayInfo(DisplayInformation di = null)
         {
             di = di ?? DisplayInformation.GetForCurrentView();
 
             var rotation = CalculateRotation(di);
             var perpendicular =
-                rotation == ScreenRotation.Rotation90 ||
-                rotation == ScreenRotation.Rotation270;
+                rotation == DisplayRotation.Rotation90 ||
+                rotation == DisplayRotation.Rotation270;
 
             var w = di.ScreenWidthInRawPixels;
             var h = di.ScreenHeightInRawPixels;
 
-            return new ScreenMetrics(
+            return new DisplayInfo(
                 width: perpendicular ? h : w,
                 height: perpendicular ? w : h,
                 density: di.LogicalDpi / 96.0,
@@ -48,26 +86,26 @@ static void StopScreenMetricsListeners()
 
         static void OnDisplayInformationChanged(DisplayInformation di, object args)
         {
-            var metrics = GetScreenMetrics(di);
-            OnScreenMetricsChanged(metrics);
+            var metrics = GetMainDisplayInfo(di);
+            OnMainDisplayInfoChanged(metrics);
         }
 
-        static ScreenOrientation CalculateOrientation(DisplayInformation di)
+        static DisplayOrientation CalculateOrientation(DisplayInformation di)
         {
             switch (di.CurrentOrientation)
             {
                 case DisplayOrientations.Landscape:
                 case DisplayOrientations.LandscapeFlipped:
-                    return ScreenOrientation.Landscape;
+                    return DisplayOrientation.Landscape;
                 case DisplayOrientations.Portrait:
                 case DisplayOrientations.PortraitFlipped:
-                    return ScreenOrientation.Portrait;
+                    return DisplayOrientation.Portrait;
             }
 
-            return ScreenOrientation.Unknown;
+            return DisplayOrientation.Unknown;
         }
 
-        static ScreenRotation CalculateRotation(DisplayInformation di)
+        static DisplayRotation CalculateRotation(DisplayInformation di)
         {
             var native = di.NativeOrientation;
             var current = di.CurrentOrientation;
@@ -76,24 +114,24 @@ static ScreenRotation CalculateRotation(DisplayInformation di)
             {
                 switch (current)
                 {
-                    case DisplayOrientations.Landscape: return ScreenRotation.Rotation90;
-                    case DisplayOrientations.Portrait: return ScreenRotation.Rotation0;
-                    case DisplayOrientations.LandscapeFlipped: return ScreenRotation.Rotation270;
-                    case DisplayOrientations.PortraitFlipped: return ScreenRotation.Rotation180;
+                    case DisplayOrientations.Landscape: return DisplayRotation.Rotation90;
+                    case DisplayOrientations.Portrait: return DisplayRotation.Rotation0;
+                    case DisplayOrientations.LandscapeFlipped: return DisplayRotation.Rotation270;
+                    case DisplayOrientations.PortraitFlipped: return DisplayRotation.Rotation180;
                 }
             }
             else if (native == DisplayOrientations.Landscape)
             {
                 switch (current)
                 {
-                    case DisplayOrientations.Landscape: return ScreenRotation.Rotation0;
-                    case DisplayOrientations.Portrait: return ScreenRotation.Rotation270;
-                    case DisplayOrientations.LandscapeFlipped: return ScreenRotation.Rotation180;
-                    case DisplayOrientations.PortraitFlipped: return ScreenRotation.Rotation90;
+                    case DisplayOrientations.Landscape: return DisplayRotation.Rotation0;
+                    case DisplayOrientations.Portrait: return DisplayRotation.Rotation270;
+                    case DisplayOrientations.LandscapeFlipped: return DisplayRotation.Rotation180;
+                    case DisplayOrientations.PortraitFlipped: return DisplayRotation.Rotation90;
                 }
             }
 
-            return ScreenRotation.Rotation0;
+            return DisplayRotation.Unknown;
         }
     }
 }
diff --git a/Xamarin.Essentials/ScreenLock/ScreenLock.android.cs b/Xamarin.Essentials/ScreenLock/ScreenLock.android.cs
deleted file mode 100644
index 3d2a8b22c..000000000
--- a/Xamarin.Essentials/ScreenLock/ScreenLock.android.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Android.Views;
-
-namespace Xamarin.Essentials
-{
-    public static partial class ScreenLock
-    {
-        static bool PlatformIsActive
-        {
-            get
-            {
-                var activity = Platform.GetCurrentActivity(true);
-                var flags = activity.Window?.Attributes?.Flags ?? 0;
-                return flags.HasFlag(WindowManagerFlags.KeepScreenOn);
-            }
-        }
-
-        static void PlatformRequestActive()
-        {
-            var activity = Platform.GetCurrentActivity(true);
-            activity.Window?.AddFlags(WindowManagerFlags.KeepScreenOn);
-        }
-
-        static void PlatformRequestRelease()
-        {
-            var activity = Platform.GetCurrentActivity(true);
-            activity.Window?.ClearFlags(WindowManagerFlags.KeepScreenOn);
-        }
-    }
-}
diff --git a/Xamarin.Essentials/ScreenLock/ScreenLock.ios.cs b/Xamarin.Essentials/ScreenLock/ScreenLock.ios.cs
deleted file mode 100644
index 9a77fce82..000000000
--- a/Xamarin.Essentials/ScreenLock/ScreenLock.ios.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using UIKit;
-
-namespace Xamarin.Essentials
-{
-    public static partial class ScreenLock
-    {
-        static bool PlatformIsActive
-            => UIApplication.SharedApplication.IdleTimerDisabled;
-
-        static void PlatformRequestActive()
-            => UIApplication.SharedApplication.IdleTimerDisabled = true;
-
-        static void PlatformRequestRelease()
-            => UIApplication.SharedApplication.IdleTimerDisabled = false;
-    }
-}
diff --git a/Xamarin.Essentials/ScreenLock/ScreenLock.netstandard.cs b/Xamarin.Essentials/ScreenLock/ScreenLock.netstandard.cs
deleted file mode 100644
index 32472196c..000000000
--- a/Xamarin.Essentials/ScreenLock/ScreenLock.netstandard.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Xamarin.Essentials
-{
-    public static partial class ScreenLock
-    {
-        static bool PlatformIsActive
-            => throw new NotImplementedInReferenceAssemblyException();
-
-        static void PlatformRequestActive()
-            => throw new NotImplementedInReferenceAssemblyException();
-
-        static void PlatformRequestRelease()
-            => throw new NotImplementedInReferenceAssemblyException();
-    }
-}
diff --git a/Xamarin.Essentials/ScreenLock/ScreenLock.shared.cs b/Xamarin.Essentials/ScreenLock/ScreenLock.shared.cs
deleted file mode 100644
index 9c4cdf64e..000000000
--- a/Xamarin.Essentials/ScreenLock/ScreenLock.shared.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Xamarin.Essentials
-{
-    public static partial class ScreenLock
-    {
-        public static bool IsActive => PlatformIsActive;
-
-        public static void RequestActive() => PlatformRequestActive();
-
-        public static void RequestRelease() => PlatformRequestRelease();
-    }
-}
diff --git a/Xamarin.Essentials/ScreenLock/ScreenLock.uwp.cs b/Xamarin.Essentials/ScreenLock/ScreenLock.uwp.cs
deleted file mode 100644
index ba4a540d7..000000000
--- a/Xamarin.Essentials/ScreenLock/ScreenLock.uwp.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Windows.System.Display;
-
-namespace Xamarin.Essentials
-{
-    public static partial class ScreenLock
-    {
-        static readonly object locker = new object();
-        static DisplayRequest displayRequest;
-
-        static bool PlatformIsActive
-        {
-            get
-            {
-                lock (locker)
-                {
-                    return displayRequest != null;
-                }
-            }
-        }
-
-        static void PlatformRequestActive()
-        {
-            lock (locker)
-            {
-                if (displayRequest == null)
-                {
-                    displayRequest = new DisplayRequest();
-                    displayRequest.RequestActive();
-                }
-            }
-        }
-
-        static void PlatformRequestRelease()
-        {
-            lock (locker)
-            {
-                if (displayRequest != null)
-                {
-                    displayRequest.RequestRelease();
-                    displayRequest = null;
-                }
-            }
-        }
-    }
-}
diff --git a/Xamarin.Essentials/Types/DisplayInfo.shared.cs b/Xamarin.Essentials/Types/DisplayInfo.shared.cs
new file mode 100644
index 000000000..e482e98c3
--- /dev/null
+++ b/Xamarin.Essentials/Types/DisplayInfo.shared.cs
@@ -0,0 +1,51 @@
+using System;
+
+namespace Xamarin.Essentials
+{
+    [Preserve(AllMembers = true)]
+    public readonly struct DisplayInfo : IEquatable<DisplayInfo>
+    {
+        public DisplayInfo(double width, double height, double density, DisplayOrientation orientation, DisplayRotation rotation)
+        {
+            Width = width;
+            Height = height;
+            Density = density;
+            Orientation = orientation;
+            Rotation = rotation;
+        }
+
+        public double Width { get; }
+
+        public double Height { get; }
+
+        public double Density { get; }
+
+        public DisplayOrientation Orientation { get; }
+
+        public DisplayRotation Rotation { get; }
+
+        public static bool operator ==(DisplayInfo left, DisplayInfo right) =>
+            Equals(left, right);
+
+        public static bool operator !=(DisplayInfo left, DisplayInfo right) =>
+            !Equals(left, right);
+
+        public override bool Equals(object obj) =>
+            (obj is DisplayInfo metrics) && Equals(metrics);
+
+        public bool Equals(DisplayInfo other) =>
+            Width.Equals(other.Width) &&
+            Height.Equals(other.Height) &&
+            Density.Equals(other.Density) &&
+            Orientation.Equals(other.Orientation) &&
+            Rotation.Equals(other.Rotation);
+
+        public override int GetHashCode() =>
+            (Height, Width, Density, Orientation, Rotation).GetHashCode();
+
+        public override string ToString() =>
+            $"{nameof(Height)}: {Height}, {nameof(Width)}: {Width}, " +
+            $"{nameof(Density)}: {Density}, {nameof(Orientation)}: {Orientation}, " +
+            $"{nameof(Rotation)}: {Rotation}";
+    }
+}
diff --git a/Xamarin.Essentials/Types/DisplayOrientation.shared.cs b/Xamarin.Essentials/Types/DisplayOrientation.shared.cs
new file mode 100644
index 000000000..78ca7d6bc
--- /dev/null
+++ b/Xamarin.Essentials/Types/DisplayOrientation.shared.cs
@@ -0,0 +1,9 @@
+namespace Xamarin.Essentials
+{
+    public enum DisplayOrientation
+    {
+        Unknown = 0,
+        Portrait = 1,
+        Landscape = 2
+    }
+}
diff --git a/Xamarin.Essentials/Types/DisplayRotation.shared.cs b/Xamarin.Essentials/Types/DisplayRotation.shared.cs
new file mode 100644
index 000000000..7c9f9c0e2
--- /dev/null
+++ b/Xamarin.Essentials/Types/DisplayRotation.shared.cs
@@ -0,0 +1,11 @@
+namespace Xamarin.Essentials
+{
+    public enum DisplayRotation
+    {
+        Unknown = 0,
+        Rotation0 = 1,
+        Rotation90 = 2,
+        Rotation180 = 3,
+        Rotation270 = 4
+    }
+}
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-android.xml b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
index 5aaa367b3..1513e7765 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-android.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
@@ -128,8 +128,9 @@
       <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.NetworkAccess" />
     </Type>
     <Type Name="Xamarin.Essentials.DeviceDisplay" Id="T:Xamarin.Essentials.DeviceDisplay">
-      <Member Id="E:Xamarin.Essentials.DeviceDisplay.ScreenMetricsChanged" />
-      <Member Id="P:Xamarin.Essentials.DeviceDisplay.ScreenMetrics" />
+      <Member Id="E:Xamarin.Essentials.DeviceDisplay.MainDisplayInfoChanged" />
+      <Member Id="P:Xamarin.Essentials.DeviceDisplay.KeepScreenOn" />
+      <Member Id="P:Xamarin.Essentials.DeviceDisplay.MainDisplayInfo" />
     </Type>
     <Type Name="Xamarin.Essentials.DeviceIdiom" Id="T:Xamarin.Essentials.DeviceIdiom">
       <Member Id="M:Xamarin.Essentials.DeviceIdiom.Create(System.String)" />
@@ -173,6 +174,32 @@
       <Member Id="F:Xamarin.Essentials.DeviceType.Physical" />
       <Member Id="F:Xamarin.Essentials.DeviceType.Virtual" />
     </Type>
+    <Type Name="Xamarin.Essentials.DisplayInfo" Id="T:Xamarin.Essentials.DisplayInfo">
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.#ctor(System.Double,System.Double,System.Double,Xamarin.Essentials.DisplayOrientation,Xamarin.Essentials.DisplayRotation)" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.Equals(System.Object)" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.Equals(Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.GetHashCode" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.op_Equality(Xamarin.Essentials.DisplayInfo,Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.op_Inequality(Xamarin.Essentials.DisplayInfo,Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.ToString" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfo.Density" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfo.Height" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfo.Orientation" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfo.Rotation" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfo.Width" />
+    </Type>
+    <Type Name="Xamarin.Essentials.DisplayOrientation" Id="T:Xamarin.Essentials.DisplayOrientation">
+      <Member Id="F:Xamarin.Essentials.DisplayOrientation.Landscape" />
+      <Member Id="F:Xamarin.Essentials.DisplayOrientation.Portrait" />
+      <Member Id="F:Xamarin.Essentials.DisplayOrientation.Unknown" />
+    </Type>
+    <Type Name="Xamarin.Essentials.DisplayRotation" Id="T:Xamarin.Essentials.DisplayRotation">
+      <Member Id="F:Xamarin.Essentials.DisplayRotation.Rotation0" />
+      <Member Id="F:Xamarin.Essentials.DisplayRotation.Rotation180" />
+      <Member Id="F:Xamarin.Essentials.DisplayRotation.Rotation270" />
+      <Member Id="F:Xamarin.Essentials.DisplayRotation.Rotation90" />
+      <Member Id="F:Xamarin.Essentials.DisplayRotation.Unknown" />
+    </Type>
     <Type Name="Xamarin.Essentials.DistanceUnits" Id="T:Xamarin.Essentials.DistanceUnits">
       <Member Id="F:Xamarin.Essentials.DistanceUnits.Kilometers" />
       <Member Id="F:Xamarin.Essentials.DistanceUnits.Miles" />
@@ -325,6 +352,10 @@
       <Member Id="M:Xamarin.Essentials.MagnetometerData.ToString" />
       <Member Id="P:Xamarin.Essentials.MagnetometerData.MagneticField" />
     </Type>
+    <Type Name="Xamarin.Essentials.MainDisplayInfoChangedEventArgs" Id="T:Xamarin.Essentials.MainDisplayInfoChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.MainDisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="P:Xamarin.Essentials.MainDisplayInfoChangedEventArgs.MainDisplayInfo" />
+    </Type>
     <Type Name="Xamarin.Essentials.MainThread" Id="T:Xamarin.Essentials.MainThread">
       <Member Id="M:Xamarin.Essentials.MainThread.BeginInvokeOnMainThread(System.Action)" />
       <Member Id="P:Xamarin.Essentials.MainThread.IsMainThread" />
@@ -445,39 +476,6 @@
       <Member Id="M:Xamarin.Essentials.Preferences.Set(System.String,System.String)" />
       <Member Id="M:Xamarin.Essentials.Preferences.Set(System.String,System.String,System.String)" />
     </Type>
-    <Type Name="Xamarin.Essentials.ScreenLock" Id="T:Xamarin.Essentials.ScreenLock">
-      <Member Id="M:Xamarin.Essentials.ScreenLock.RequestActive" />
-      <Member Id="M:Xamarin.Essentials.ScreenLock.RequestRelease" />
-      <Member Id="P:Xamarin.Essentials.ScreenLock.IsActive" />
-    </Type>
-    <Type Name="Xamarin.Essentials.ScreenMetrics" Id="T:Xamarin.Essentials.ScreenMetrics">
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.Equals(System.Object)" />
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.Equals(Xamarin.Essentials.ScreenMetrics)" />
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.GetHashCode" />
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.op_Equality(Xamarin.Essentials.ScreenMetrics,Xamarin.Essentials.ScreenMetrics)" />
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.op_Inequality(Xamarin.Essentials.ScreenMetrics,Xamarin.Essentials.ScreenMetrics)" />
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.ToString" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetrics.Density" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetrics.Height" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetrics.Orientation" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetrics.Rotation" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetrics.Width" />
-    </Type>
-    <Type Name="Xamarin.Essentials.ScreenMetricsChangedEventArgs" Id="T:Xamarin.Essentials.ScreenMetricsChangedEventArgs">
-      <Member Id="M:Xamarin.Essentials.ScreenMetricsChangedEventArgs.#ctor(Xamarin.Essentials.ScreenMetrics)" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetricsChangedEventArgs.Metrics" />
-    </Type>
-    <Type Name="Xamarin.Essentials.ScreenOrientation" Id="T:Xamarin.Essentials.ScreenOrientation">
-      <Member Id="F:Xamarin.Essentials.ScreenOrientation.Landscape" />
-      <Member Id="F:Xamarin.Essentials.ScreenOrientation.Portrait" />
-      <Member Id="F:Xamarin.Essentials.ScreenOrientation.Unknown" />
-    </Type>
-    <Type Name="Xamarin.Essentials.ScreenRotation" Id="T:Xamarin.Essentials.ScreenRotation">
-      <Member Id="F:Xamarin.Essentials.ScreenRotation.Rotation0" />
-      <Member Id="F:Xamarin.Essentials.ScreenRotation.Rotation180" />
-      <Member Id="F:Xamarin.Essentials.ScreenRotation.Rotation270" />
-      <Member Id="F:Xamarin.Essentials.ScreenRotation.Rotation90" />
-    </Type>
     <Type Name="Xamarin.Essentials.SecureStorage" Id="T:Xamarin.Essentials.SecureStorage">
       <Member Id="M:Xamarin.Essentials.SecureStorage.GetAsync(System.String)" />
       <Member Id="M:Xamarin.Essentials.SecureStorage.Remove(System.String)" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
index 03fe6d94b..7eece042c 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
@@ -129,8 +129,9 @@
       <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.NetworkAccess" />
     </Type>
     <Type Name="Xamarin.Essentials.DeviceDisplay" Id="T:Xamarin.Essentials.DeviceDisplay">
-      <Member Id="E:Xamarin.Essentials.DeviceDisplay.ScreenMetricsChanged" />
-      <Member Id="P:Xamarin.Essentials.DeviceDisplay.ScreenMetrics" />
+      <Member Id="E:Xamarin.Essentials.DeviceDisplay.MainDisplayInfoChanged" />
+      <Member Id="P:Xamarin.Essentials.DeviceDisplay.KeepScreenOn" />
+      <Member Id="P:Xamarin.Essentials.DeviceDisplay.MainDisplayInfo" />
     </Type>
     <Type Name="Xamarin.Essentials.DeviceIdiom" Id="T:Xamarin.Essentials.DeviceIdiom">
       <Member Id="M:Xamarin.Essentials.DeviceIdiom.Create(System.String)" />
@@ -174,6 +175,32 @@
       <Member Id="F:Xamarin.Essentials.DeviceType.Physical" />
       <Member Id="F:Xamarin.Essentials.DeviceType.Virtual" />
     </Type>
+    <Type Name="Xamarin.Essentials.DisplayInfo" Id="T:Xamarin.Essentials.DisplayInfo">
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.#ctor(System.Double,System.Double,System.Double,Xamarin.Essentials.DisplayOrientation,Xamarin.Essentials.DisplayRotation)" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.Equals(System.Object)" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.Equals(Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.GetHashCode" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.op_Equality(Xamarin.Essentials.DisplayInfo,Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.op_Inequality(Xamarin.Essentials.DisplayInfo,Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.ToString" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfo.Density" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfo.Height" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfo.Orientation" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfo.Rotation" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfo.Width" />
+    </Type>
+    <Type Name="Xamarin.Essentials.DisplayOrientation" Id="T:Xamarin.Essentials.DisplayOrientation">
+      <Member Id="F:Xamarin.Essentials.DisplayOrientation.Landscape" />
+      <Member Id="F:Xamarin.Essentials.DisplayOrientation.Portrait" />
+      <Member Id="F:Xamarin.Essentials.DisplayOrientation.Unknown" />
+    </Type>
+    <Type Name="Xamarin.Essentials.DisplayRotation" Id="T:Xamarin.Essentials.DisplayRotation">
+      <Member Id="F:Xamarin.Essentials.DisplayRotation.Rotation0" />
+      <Member Id="F:Xamarin.Essentials.DisplayRotation.Rotation180" />
+      <Member Id="F:Xamarin.Essentials.DisplayRotation.Rotation270" />
+      <Member Id="F:Xamarin.Essentials.DisplayRotation.Rotation90" />
+      <Member Id="F:Xamarin.Essentials.DisplayRotation.Unknown" />
+    </Type>
     <Type Name="Xamarin.Essentials.DistanceUnits" Id="T:Xamarin.Essentials.DistanceUnits">
       <Member Id="F:Xamarin.Essentials.DistanceUnits.Kilometers" />
       <Member Id="F:Xamarin.Essentials.DistanceUnits.Miles" />
@@ -326,6 +353,10 @@
       <Member Id="M:Xamarin.Essentials.MagnetometerData.ToString" />
       <Member Id="P:Xamarin.Essentials.MagnetometerData.MagneticField" />
     </Type>
+    <Type Name="Xamarin.Essentials.MainDisplayInfoChangedEventArgs" Id="T:Xamarin.Essentials.MainDisplayInfoChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.MainDisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="P:Xamarin.Essentials.MainDisplayInfoChangedEventArgs.MainDisplayInfo" />
+    </Type>
     <Type Name="Xamarin.Essentials.MainThread" Id="T:Xamarin.Essentials.MainThread">
       <Member Id="M:Xamarin.Essentials.MainThread.BeginInvokeOnMainThread(System.Action)" />
       <Member Id="P:Xamarin.Essentials.MainThread.IsMainThread" />
@@ -442,39 +473,6 @@
       <Member Id="M:Xamarin.Essentials.Preferences.Set(System.String,System.String)" />
       <Member Id="M:Xamarin.Essentials.Preferences.Set(System.String,System.String,System.String)" />
     </Type>
-    <Type Name="Xamarin.Essentials.ScreenLock" Id="T:Xamarin.Essentials.ScreenLock">
-      <Member Id="M:Xamarin.Essentials.ScreenLock.RequestActive" />
-      <Member Id="M:Xamarin.Essentials.ScreenLock.RequestRelease" />
-      <Member Id="P:Xamarin.Essentials.ScreenLock.IsActive" />
-    </Type>
-    <Type Name="Xamarin.Essentials.ScreenMetrics" Id="T:Xamarin.Essentials.ScreenMetrics">
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.Equals(System.Object)" />
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.Equals(Xamarin.Essentials.ScreenMetrics)" />
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.GetHashCode" />
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.op_Equality(Xamarin.Essentials.ScreenMetrics,Xamarin.Essentials.ScreenMetrics)" />
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.op_Inequality(Xamarin.Essentials.ScreenMetrics,Xamarin.Essentials.ScreenMetrics)" />
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.ToString" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetrics.Density" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetrics.Height" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetrics.Orientation" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetrics.Rotation" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetrics.Width" />
-    </Type>
-    <Type Name="Xamarin.Essentials.ScreenMetricsChangedEventArgs" Id="T:Xamarin.Essentials.ScreenMetricsChangedEventArgs">
-      <Member Id="M:Xamarin.Essentials.ScreenMetricsChangedEventArgs.#ctor(Xamarin.Essentials.ScreenMetrics)" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetricsChangedEventArgs.Metrics" />
-    </Type>
-    <Type Name="Xamarin.Essentials.ScreenOrientation" Id="T:Xamarin.Essentials.ScreenOrientation">
-      <Member Id="F:Xamarin.Essentials.ScreenOrientation.Landscape" />
-      <Member Id="F:Xamarin.Essentials.ScreenOrientation.Portrait" />
-      <Member Id="F:Xamarin.Essentials.ScreenOrientation.Unknown" />
-    </Type>
-    <Type Name="Xamarin.Essentials.ScreenRotation" Id="T:Xamarin.Essentials.ScreenRotation">
-      <Member Id="F:Xamarin.Essentials.ScreenRotation.Rotation0" />
-      <Member Id="F:Xamarin.Essentials.ScreenRotation.Rotation180" />
-      <Member Id="F:Xamarin.Essentials.ScreenRotation.Rotation270" />
-      <Member Id="F:Xamarin.Essentials.ScreenRotation.Rotation90" />
-    </Type>
     <Type Name="Xamarin.Essentials.SecureStorage" Id="T:Xamarin.Essentials.SecureStorage">
       <Member Id="M:Xamarin.Essentials.SecureStorage.GetAsync(System.String)" />
       <Member Id="M:Xamarin.Essentials.SecureStorage.Remove(System.String)" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
index d5eab06df..a35f964b4 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
@@ -128,8 +128,9 @@
       <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.NetworkAccess" />
     </Type>
     <Type Name="Xamarin.Essentials.DeviceDisplay" Id="T:Xamarin.Essentials.DeviceDisplay">
-      <Member Id="E:Xamarin.Essentials.DeviceDisplay.ScreenMetricsChanged" />
-      <Member Id="P:Xamarin.Essentials.DeviceDisplay.ScreenMetrics" />
+      <Member Id="E:Xamarin.Essentials.DeviceDisplay.MainDisplayInfoChanged" />
+      <Member Id="P:Xamarin.Essentials.DeviceDisplay.KeepScreenOn" />
+      <Member Id="P:Xamarin.Essentials.DeviceDisplay.MainDisplayInfo" />
     </Type>
     <Type Name="Xamarin.Essentials.DeviceIdiom" Id="T:Xamarin.Essentials.DeviceIdiom">
       <Member Id="M:Xamarin.Essentials.DeviceIdiom.Create(System.String)" />
@@ -173,6 +174,32 @@
       <Member Id="F:Xamarin.Essentials.DeviceType.Physical" />
       <Member Id="F:Xamarin.Essentials.DeviceType.Virtual" />
     </Type>
+    <Type Name="Xamarin.Essentials.DisplayInfo" Id="T:Xamarin.Essentials.DisplayInfo">
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.#ctor(System.Double,System.Double,System.Double,Xamarin.Essentials.DisplayOrientation,Xamarin.Essentials.DisplayRotation)" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.Equals(System.Object)" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.Equals(Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.GetHashCode" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.op_Equality(Xamarin.Essentials.DisplayInfo,Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.op_Inequality(Xamarin.Essentials.DisplayInfo,Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.ToString" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfo.Density" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfo.Height" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfo.Orientation" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfo.Rotation" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfo.Width" />
+    </Type>
+    <Type Name="Xamarin.Essentials.DisplayOrientation" Id="T:Xamarin.Essentials.DisplayOrientation">
+      <Member Id="F:Xamarin.Essentials.DisplayOrientation.Landscape" />
+      <Member Id="F:Xamarin.Essentials.DisplayOrientation.Portrait" />
+      <Member Id="F:Xamarin.Essentials.DisplayOrientation.Unknown" />
+    </Type>
+    <Type Name="Xamarin.Essentials.DisplayRotation" Id="T:Xamarin.Essentials.DisplayRotation">
+      <Member Id="F:Xamarin.Essentials.DisplayRotation.Rotation0" />
+      <Member Id="F:Xamarin.Essentials.DisplayRotation.Rotation180" />
+      <Member Id="F:Xamarin.Essentials.DisplayRotation.Rotation270" />
+      <Member Id="F:Xamarin.Essentials.DisplayRotation.Rotation90" />
+      <Member Id="F:Xamarin.Essentials.DisplayRotation.Unknown" />
+    </Type>
     <Type Name="Xamarin.Essentials.DistanceUnits" Id="T:Xamarin.Essentials.DistanceUnits">
       <Member Id="F:Xamarin.Essentials.DistanceUnits.Kilometers" />
       <Member Id="F:Xamarin.Essentials.DistanceUnits.Miles" />
@@ -325,6 +352,10 @@
       <Member Id="M:Xamarin.Essentials.MagnetometerData.ToString" />
       <Member Id="P:Xamarin.Essentials.MagnetometerData.MagneticField" />
     </Type>
+    <Type Name="Xamarin.Essentials.MainDisplayInfoChangedEventArgs" Id="T:Xamarin.Essentials.MainDisplayInfoChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.MainDisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="P:Xamarin.Essentials.MainDisplayInfoChangedEventArgs.MainDisplayInfo" />
+    </Type>
     <Type Name="Xamarin.Essentials.MainThread" Id="T:Xamarin.Essentials.MainThread">
       <Member Id="M:Xamarin.Essentials.MainThread.BeginInvokeOnMainThread(System.Action)" />
       <Member Id="P:Xamarin.Essentials.MainThread.IsMainThread" />
@@ -443,39 +474,6 @@
       <Member Id="M:Xamarin.Essentials.Preferences.Set(System.String,System.String)" />
       <Member Id="M:Xamarin.Essentials.Preferences.Set(System.String,System.String,System.String)" />
     </Type>
-    <Type Name="Xamarin.Essentials.ScreenLock" Id="T:Xamarin.Essentials.ScreenLock">
-      <Member Id="M:Xamarin.Essentials.ScreenLock.RequestActive" />
-      <Member Id="M:Xamarin.Essentials.ScreenLock.RequestRelease" />
-      <Member Id="P:Xamarin.Essentials.ScreenLock.IsActive" />
-    </Type>
-    <Type Name="Xamarin.Essentials.ScreenMetrics" Id="T:Xamarin.Essentials.ScreenMetrics">
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.Equals(System.Object)" />
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.Equals(Xamarin.Essentials.ScreenMetrics)" />
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.GetHashCode" />
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.op_Equality(Xamarin.Essentials.ScreenMetrics,Xamarin.Essentials.ScreenMetrics)" />
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.op_Inequality(Xamarin.Essentials.ScreenMetrics,Xamarin.Essentials.ScreenMetrics)" />
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.ToString" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetrics.Density" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetrics.Height" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetrics.Orientation" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetrics.Rotation" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetrics.Width" />
-    </Type>
-    <Type Name="Xamarin.Essentials.ScreenMetricsChangedEventArgs" Id="T:Xamarin.Essentials.ScreenMetricsChangedEventArgs">
-      <Member Id="M:Xamarin.Essentials.ScreenMetricsChangedEventArgs.#ctor(Xamarin.Essentials.ScreenMetrics)" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetricsChangedEventArgs.Metrics" />
-    </Type>
-    <Type Name="Xamarin.Essentials.ScreenOrientation" Id="T:Xamarin.Essentials.ScreenOrientation">
-      <Member Id="F:Xamarin.Essentials.ScreenOrientation.Landscape" />
-      <Member Id="F:Xamarin.Essentials.ScreenOrientation.Portrait" />
-      <Member Id="F:Xamarin.Essentials.ScreenOrientation.Unknown" />
-    </Type>
-    <Type Name="Xamarin.Essentials.ScreenRotation" Id="T:Xamarin.Essentials.ScreenRotation">
-      <Member Id="F:Xamarin.Essentials.ScreenRotation.Rotation0" />
-      <Member Id="F:Xamarin.Essentials.ScreenRotation.Rotation180" />
-      <Member Id="F:Xamarin.Essentials.ScreenRotation.Rotation270" />
-      <Member Id="F:Xamarin.Essentials.ScreenRotation.Rotation90" />
-    </Type>
     <Type Name="Xamarin.Essentials.SecureStorage" Id="T:Xamarin.Essentials.SecureStorage">
       <Member Id="M:Xamarin.Essentials.SecureStorage.GetAsync(System.String)" />
       <Member Id="M:Xamarin.Essentials.SecureStorage.Remove(System.String)" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials.xml b/docs/en/FrameworksIndex/xamarin-essentials.xml
index e8d39e53d..66b106148 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials.xml
@@ -128,8 +128,9 @@
       <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.NetworkAccess" />
     </Type>
     <Type Name="Xamarin.Essentials.DeviceDisplay" Id="T:Xamarin.Essentials.DeviceDisplay">
-      <Member Id="E:Xamarin.Essentials.DeviceDisplay.ScreenMetricsChanged" />
-      <Member Id="P:Xamarin.Essentials.DeviceDisplay.ScreenMetrics" />
+      <Member Id="E:Xamarin.Essentials.DeviceDisplay.MainDisplayInfoChanged" />
+      <Member Id="P:Xamarin.Essentials.DeviceDisplay.KeepScreenOn" />
+      <Member Id="P:Xamarin.Essentials.DeviceDisplay.MainDisplayInfo" />
     </Type>
     <Type Name="Xamarin.Essentials.DeviceIdiom" Id="T:Xamarin.Essentials.DeviceIdiom">
       <Member Id="M:Xamarin.Essentials.DeviceIdiom.Create(System.String)" />
@@ -173,6 +174,32 @@
       <Member Id="F:Xamarin.Essentials.DeviceType.Physical" />
       <Member Id="F:Xamarin.Essentials.DeviceType.Virtual" />
     </Type>
+    <Type Name="Xamarin.Essentials.DisplayInfo" Id="T:Xamarin.Essentials.DisplayInfo">
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.#ctor(System.Double,System.Double,System.Double,Xamarin.Essentials.DisplayOrientation,Xamarin.Essentials.DisplayRotation)" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.Equals(System.Object)" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.Equals(Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.GetHashCode" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.op_Equality(Xamarin.Essentials.DisplayInfo,Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.op_Inequality(Xamarin.Essentials.DisplayInfo,Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="M:Xamarin.Essentials.DisplayInfo.ToString" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfo.Density" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfo.Height" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfo.Orientation" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfo.Rotation" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfo.Width" />
+    </Type>
+    <Type Name="Xamarin.Essentials.DisplayOrientation" Id="T:Xamarin.Essentials.DisplayOrientation">
+      <Member Id="F:Xamarin.Essentials.DisplayOrientation.Landscape" />
+      <Member Id="F:Xamarin.Essentials.DisplayOrientation.Portrait" />
+      <Member Id="F:Xamarin.Essentials.DisplayOrientation.Unknown" />
+    </Type>
+    <Type Name="Xamarin.Essentials.DisplayRotation" Id="T:Xamarin.Essentials.DisplayRotation">
+      <Member Id="F:Xamarin.Essentials.DisplayRotation.Rotation0" />
+      <Member Id="F:Xamarin.Essentials.DisplayRotation.Rotation180" />
+      <Member Id="F:Xamarin.Essentials.DisplayRotation.Rotation270" />
+      <Member Id="F:Xamarin.Essentials.DisplayRotation.Rotation90" />
+      <Member Id="F:Xamarin.Essentials.DisplayRotation.Unknown" />
+    </Type>
     <Type Name="Xamarin.Essentials.DistanceUnits" Id="T:Xamarin.Essentials.DistanceUnits">
       <Member Id="F:Xamarin.Essentials.DistanceUnits.Kilometers" />
       <Member Id="F:Xamarin.Essentials.DistanceUnits.Miles" />
@@ -325,6 +352,10 @@
       <Member Id="M:Xamarin.Essentials.MagnetometerData.ToString" />
       <Member Id="P:Xamarin.Essentials.MagnetometerData.MagneticField" />
     </Type>
+    <Type Name="Xamarin.Essentials.MainDisplayInfoChangedEventArgs" Id="T:Xamarin.Essentials.MainDisplayInfoChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.MainDisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="P:Xamarin.Essentials.MainDisplayInfoChangedEventArgs.MainDisplayInfo" />
+    </Type>
     <Type Name="Xamarin.Essentials.MainThread" Id="T:Xamarin.Essentials.MainThread">
       <Member Id="M:Xamarin.Essentials.MainThread.BeginInvokeOnMainThread(System.Action)" />
       <Member Id="P:Xamarin.Essentials.MainThread.IsMainThread" />
@@ -440,39 +471,6 @@
       <Member Id="M:Xamarin.Essentials.Preferences.Set(System.String,System.String)" />
       <Member Id="M:Xamarin.Essentials.Preferences.Set(System.String,System.String,System.String)" />
     </Type>
-    <Type Name="Xamarin.Essentials.ScreenLock" Id="T:Xamarin.Essentials.ScreenLock">
-      <Member Id="M:Xamarin.Essentials.ScreenLock.RequestActive" />
-      <Member Id="M:Xamarin.Essentials.ScreenLock.RequestRelease" />
-      <Member Id="P:Xamarin.Essentials.ScreenLock.IsActive" />
-    </Type>
-    <Type Name="Xamarin.Essentials.ScreenMetrics" Id="T:Xamarin.Essentials.ScreenMetrics">
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.Equals(System.Object)" />
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.Equals(Xamarin.Essentials.ScreenMetrics)" />
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.GetHashCode" />
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.op_Equality(Xamarin.Essentials.ScreenMetrics,Xamarin.Essentials.ScreenMetrics)" />
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.op_Inequality(Xamarin.Essentials.ScreenMetrics,Xamarin.Essentials.ScreenMetrics)" />
-      <Member Id="M:Xamarin.Essentials.ScreenMetrics.ToString" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetrics.Density" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetrics.Height" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetrics.Orientation" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetrics.Rotation" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetrics.Width" />
-    </Type>
-    <Type Name="Xamarin.Essentials.ScreenMetricsChangedEventArgs" Id="T:Xamarin.Essentials.ScreenMetricsChangedEventArgs">
-      <Member Id="M:Xamarin.Essentials.ScreenMetricsChangedEventArgs.#ctor(Xamarin.Essentials.ScreenMetrics)" />
-      <Member Id="P:Xamarin.Essentials.ScreenMetricsChangedEventArgs.Metrics" />
-    </Type>
-    <Type Name="Xamarin.Essentials.ScreenOrientation" Id="T:Xamarin.Essentials.ScreenOrientation">
-      <Member Id="F:Xamarin.Essentials.ScreenOrientation.Landscape" />
-      <Member Id="F:Xamarin.Essentials.ScreenOrientation.Portrait" />
-      <Member Id="F:Xamarin.Essentials.ScreenOrientation.Unknown" />
-    </Type>
-    <Type Name="Xamarin.Essentials.ScreenRotation" Id="T:Xamarin.Essentials.ScreenRotation">
-      <Member Id="F:Xamarin.Essentials.ScreenRotation.Rotation0" />
-      <Member Id="F:Xamarin.Essentials.ScreenRotation.Rotation180" />
-      <Member Id="F:Xamarin.Essentials.ScreenRotation.Rotation270" />
-      <Member Id="F:Xamarin.Essentials.ScreenRotation.Rotation90" />
-    </Type>
     <Type Name="Xamarin.Essentials.SecureStorage" Id="T:Xamarin.Essentials.SecureStorage">
       <Member Id="M:Xamarin.Essentials.SecureStorage.GetAsync(System.String)" />
       <Member Id="M:Xamarin.Essentials.SecureStorage.Remove(System.String)" />
diff --git a/docs/en/Xamarin.Essentials/ScreenMetrics.xml b/docs/en/Xamarin.Essentials/DisplayInfo.xml
similarity index 59%
rename from docs/en/Xamarin.Essentials/ScreenMetrics.xml
rename to docs/en/Xamarin.Essentials/DisplayInfo.xml
index 1fc6ed9de..aa2d49a6d 100644
--- a/docs/en/Xamarin.Essentials/ScreenMetrics.xml
+++ b/docs/en/Xamarin.Essentials/DisplayInfo.xml
@@ -1,7 +1,7 @@
-<Type Name="ScreenMetrics" FullName="Xamarin.Essentials.ScreenMetrics">
-  <TypeSignature Language="C#" Value="public struct ScreenMetrics : IEquatable&lt;Xamarin.Essentials.ScreenMetrics&gt;" />
-  <TypeSignature Language="ILAsm" Value=".class public sequential ansi sealed beforefieldinit ScreenMetrics extends System.ValueType implements class System.IEquatable`1&lt;valuetype Xamarin.Essentials.ScreenMetrics&gt;" />
-  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.ScreenMetrics" />
+<Type Name="DisplayInfo" FullName="Xamarin.Essentials.DisplayInfo">
+  <TypeSignature Language="C#" Value="public struct DisplayInfo : IEquatable&lt;Xamarin.Essentials.DisplayInfo&gt;" />
+  <TypeSignature Language="ILAsm" Value=".class public sequential ansi sealed beforefieldinit DisplayInfo extends System.ValueType implements class System.IEquatable`1&lt;valuetype Xamarin.Essentials.DisplayInfo&gt;" />
+  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.DisplayInfo" />
   <AssemblyInfo>
     <AssemblyName>Xamarin.Essentials</AssemblyName>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -11,7 +11,7 @@
   </Base>
   <Interfaces>
     <Interface>
-      <InterfaceName>System.IEquatable&lt;Xamarin.Essentials.ScreenMetrics&gt;</InterfaceName>
+      <InterfaceName>System.IEquatable&lt;Xamarin.Essentials.DisplayInfo&gt;</InterfaceName>
     </Interface>
   </Interfaces>
   <Attributes>
@@ -20,32 +20,62 @@
     </Attribute>
   </Attributes>
   <Docs>
-    <summary>This type represents the properties of the current screen.</summary>
-    <remarks></remarks>
+    <summary>Represents information about the screen.</summary>
+    <remarks>
+      <para></para>
+    </remarks>
   </Docs>
   <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public DisplayInfo (double width, double height, double density, Xamarin.Essentials.DisplayOrientation orientation, Xamarin.Essentials.DisplayRotation rotation);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(float64 width, float64 height, float64 density, valuetype Xamarin.Essentials.DisplayOrientation orientation, valuetype Xamarin.Essentials.DisplayRotation rotation) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DisplayInfo.#ctor(System.Double,System.Double,System.Double,Xamarin.Essentials.DisplayOrientation,Xamarin.Essentials.DisplayRotation)" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters>
+        <Parameter Name="width" Type="System.Double" />
+        <Parameter Name="height" Type="System.Double" />
+        <Parameter Name="density" Type="System.Double" />
+        <Parameter Name="orientation" Type="Xamarin.Essentials.DisplayOrientation" />
+        <Parameter Name="rotation" Type="Xamarin.Essentials.DisplayRotation" />
+      </Parameters>
+      <Docs>
+        <param name="width">To be added.</param>
+        <param name="height">To be added.</param>
+        <param name="density">To be added.</param>
+        <param name="orientation">To be added.</param>
+        <param name="rotation">To be added.</param>
+        <summary>Main constructor for Display Information</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Density">
       <MemberSignature Language="C#" Value="public double Density { get; }" />
       <MemberSignature Language="ILAsm" Value=".property instance float64 Density" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.ScreenMetrics.Density" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.DisplayInfo.Density" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
         <ReturnType>System.Double</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Gets a value representing the current screen density.</summary>
-        <value></value>
-        <remarks>This value is a multiple value, such that a retina display would be 2.0 or 3.0. On Windows, the scaling percent of 200% means that the density will be 2.0.</remarks>
+        <summary>Gets a value representing the screen density.</summary>
+        <value>The screen density.</value>
+        <remarks>
+          <para />
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="Equals">
       <MemberSignature Language="C#" Value="public override bool Equals (object obj);" />
       <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance bool Equals(object obj) cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.ScreenMetrics.Equals(System.Object)" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DisplayInfo.Equals(System.Object)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
@@ -58,18 +88,18 @@
         <Parameter Name="obj" Type="System.Object" />
       </Parameters>
       <Docs>
-        <param name="obj">Object to compare</param>
-        <summary>If equal to another object</summary>
-        <returns>If equal</returns>
+        <param name="obj">Object to compare.</param>
+        <summary>If equal to another object.</summary>
+        <returns>If equal.</returns>
         <remarks>
           <para />
         </remarks>
       </Docs>
     </Member>
     <Member MemberName="Equals">
-      <MemberSignature Language="C#" Value="public bool Equals (Xamarin.Essentials.ScreenMetrics other);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance bool Equals(valuetype Xamarin.Essentials.ScreenMetrics other) cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.ScreenMetrics.Equals(Xamarin.Essentials.ScreenMetrics)" />
+      <MemberSignature Language="C#" Value="public bool Equals (Xamarin.Essentials.DisplayInfo other);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig newslot virtual instance bool Equals(valuetype Xamarin.Essentials.DisplayInfo other) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DisplayInfo.Equals(Xamarin.Essentials.DisplayInfo)" />
       <MemberType>Method</MemberType>
       <Implements>
         <InterfaceMember>M:System.IEquatable`1.Equals(`0)</InterfaceMember>
@@ -82,19 +112,21 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Parameters>
-        <Parameter Name="other" Type="Xamarin.Essentials.ScreenMetrics" />
+        <Parameter Name="other" Type="Xamarin.Essentials.DisplayInfo" />
       </Parameters>
       <Docs>
-        <param name="other">The other ScreenMetrics</param>
-        <summary>If equal to another ScreenMetrics</summary>
-        <returns>If equal</returns>
-        <remarks>To be added.</remarks>
+        <param name="other">The other display info to compare.</param>
+        <summary>If equal to another object.</summary>
+        <returns>If equal.</returns>
+        <remarks>
+          <para />
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="GetHashCode">
       <MemberSignature Language="C#" Value="public override int GetHashCode ();" />
       <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance int32 GetHashCode() cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.ScreenMetrics.GetHashCode" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DisplayInfo.GetHashCode" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
@@ -105,8 +137,8 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>Get the hash code for object.</summary>
-        <returns>The hash code</returns>
+        <summary>Gets the hash code for object.</summary>
+        <returns>The hash code.</returns>
         <remarks>
           <para />
         </remarks>
@@ -115,25 +147,27 @@
     <Member MemberName="Height">
       <MemberSignature Language="C#" Value="public double Height { get; }" />
       <MemberSignature Language="ILAsm" Value=".property instance float64 Height" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.ScreenMetrics.Height" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.DisplayInfo.Height" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
         <ReturnType>System.Double</ReturnType>
       </ReturnValue>
       <Docs>
         <summary>Gets the height of the screen for the current orientation.</summary>
-        <value></value>
-        <remarks>This value is the height after rotation, so a landscape iPhone will have a smaller height than width.</remarks>
+        <value>The height in pixels.</value>
+        <remarks>
+          <para />
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="op_Equality">
-      <MemberSignature Language="C#" Value="public static bool operator == (Xamarin.Essentials.ScreenMetrics left, Xamarin.Essentials.ScreenMetrics right);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig specialname bool op_Equality(valuetype Xamarin.Essentials.ScreenMetrics left, valuetype Xamarin.Essentials.ScreenMetrics right) cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.ScreenMetrics.op_Equality(Xamarin.Essentials.ScreenMetrics,Xamarin.Essentials.ScreenMetrics)" />
+      <MemberSignature Language="C#" Value="public static bool operator == (Xamarin.Essentials.DisplayInfo left, Xamarin.Essentials.DisplayInfo right);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig specialname bool op_Equality(valuetype Xamarin.Essentials.DisplayInfo left, valuetype Xamarin.Essentials.DisplayInfo right) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DisplayInfo.op_Equality(Xamarin.Essentials.DisplayInfo,Xamarin.Essentials.DisplayInfo)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
@@ -143,13 +177,13 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Parameters>
-        <Parameter Name="left" Type="Xamarin.Essentials.ScreenMetrics" />
-        <Parameter Name="right" Type="Xamarin.Essentials.ScreenMetrics" />
+        <Parameter Name="left" Type="Xamarin.Essentials.DisplayInfo" />
+        <Parameter Name="right" Type="Xamarin.Essentials.DisplayInfo" />
       </Parameters>
       <Docs>
-        <param name="left">Left to compare</param>
-        <param name="right">Right to compare</param>
-        <summary>Equality operator for equals</summary>
+        <param name="left">Left to compare.</param>
+        <param name="right">Right to compare.</param>
+        <summary>If equal to another object.</summary>
         <returns>If equal</returns>
         <remarks>
           <para />
@@ -157,9 +191,9 @@
       </Docs>
     </Member>
     <Member MemberName="op_Inequality">
-      <MemberSignature Language="C#" Value="public static bool operator != (Xamarin.Essentials.ScreenMetrics left, Xamarin.Essentials.ScreenMetrics right);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig specialname bool op_Inequality(valuetype Xamarin.Essentials.ScreenMetrics left, valuetype Xamarin.Essentials.ScreenMetrics right) cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.ScreenMetrics.op_Inequality(Xamarin.Essentials.ScreenMetrics,Xamarin.Essentials.ScreenMetrics)" />
+      <MemberSignature Language="C#" Value="public static bool operator != (Xamarin.Essentials.DisplayInfo left, Xamarin.Essentials.DisplayInfo right);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig specialname bool op_Inequality(valuetype Xamarin.Essentials.DisplayInfo left, valuetype Xamarin.Essentials.DisplayInfo right) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DisplayInfo.op_Inequality(Xamarin.Essentials.DisplayInfo,Xamarin.Essentials.DisplayInfo)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
@@ -169,13 +203,13 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Parameters>
-        <Parameter Name="left" Type="Xamarin.Essentials.ScreenMetrics" />
-        <Parameter Name="right" Type="Xamarin.Essentials.ScreenMetrics" />
+        <Parameter Name="left" Type="Xamarin.Essentials.DisplayInfo" />
+        <Parameter Name="right" Type="Xamarin.Essentials.DisplayInfo" />
       </Parameters>
       <Docs>
-        <param name="left">Left to check</param>
-        <param name="right">Right to check</param>
-        <summary>Inequality check</summary>
+        <param name="left">Left to compare</param>
+        <param name="right">Right to compare</param>
+        <summary>If not equal to another object.</summary>
         <returns>If not equal</returns>
         <remarks>
           <para />
@@ -183,49 +217,49 @@
       </Docs>
     </Member>
     <Member MemberName="Orientation">
-      <MemberSignature Language="C#" Value="public Xamarin.Essentials.ScreenOrientation Orientation { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Essentials.ScreenOrientation Orientation" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.ScreenMetrics.Orientation" />
+      <MemberSignature Language="C#" Value="public Xamarin.Essentials.DisplayOrientation Orientation { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Essentials.DisplayOrientation Orientation" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.DisplayInfo.Orientation" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>Xamarin.Essentials.ScreenOrientation</ReturnType>
+        <ReturnType>Xamarin.Essentials.DisplayOrientation</ReturnType>
       </ReturnValue>
       <Docs>
         <summary>Gets the orientation of the device.</summary>
-        <value>
+        <value>The orientation.</value>
+        <remarks>
           <para />
-        </value>
-        <remarks>If the device is a square device, then the orientation will be portrait.</remarks>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="Rotation">
-      <MemberSignature Language="C#" Value="public Xamarin.Essentials.ScreenRotation Rotation { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Essentials.ScreenRotation Rotation" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.ScreenMetrics.Rotation" />
+      <MemberSignature Language="C#" Value="public Xamarin.Essentials.DisplayRotation Rotation { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Essentials.DisplayRotation Rotation" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.DisplayInfo.Rotation" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>Xamarin.Essentials.ScreenRotation</ReturnType>
+        <ReturnType>Xamarin.Essentials.DisplayRotation</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Gets the current rotation from the designed orientation.</summary>
-        <value>
+        <summary>Gets the rotation from the designated orientation.</summary>
+        <value>The rotation</value>
+        <remarks>
           <para />
-        </value>
-        <remarks>This represents the degrees that the device has been rotated. For example, if this is a phone (which is designed for portrait) that has been rotated to landscape with the main buttoms to the right, then the device has been rotated to the left by 90 degrees.</remarks>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="ToString">
       <MemberSignature Language="C#" Value="public override string ToString ();" />
       <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance string ToString() cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.ScreenMetrics.ToString" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DisplayInfo.ToString" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
@@ -236,27 +270,31 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
+        <summary>String representation of information.</summary>
+        <returns>String information about display info.</returns>
+        <remarks>
+          <para />
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName="Width">
       <MemberSignature Language="C#" Value="public double Width { get; }" />
       <MemberSignature Language="ILAsm" Value=".property instance float64 Width" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.ScreenMetrics.Width" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.DisplayInfo.Width" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
         <ReturnType>System.Double</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Gets the width of the screen in the current orientation.</summary>
-        <value></value>
-        <remarks>This value is the width after rotation, so a landscape Android phone will have a larget width than height.</remarks>
+        <summary>Gets the width of the scrreen for the current orientation.</summary>
+        <value>The width in pixels.</value>
+        <remarks>
+          <para />
+        </remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/Xamarin.Essentials/ScreenOrientation.xml b/docs/en/Xamarin.Essentials/DisplayOrientation.xml
similarity index 63%
rename from docs/en/Xamarin.Essentials/ScreenOrientation.xml
rename to docs/en/Xamarin.Essentials/DisplayOrientation.xml
index b4d2b5964..8a01604c2 100644
--- a/docs/en/Xamarin.Essentials/ScreenOrientation.xml
+++ b/docs/en/Xamarin.Essentials/DisplayOrientation.xml
@@ -1,7 +1,7 @@
-<Type Name="ScreenOrientation" FullName="Xamarin.Essentials.ScreenOrientation">
-  <TypeSignature Language="C#" Value="public enum ScreenOrientation" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed ScreenOrientation extends System.Enum" />
-  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.ScreenOrientation" />
+<Type Name="DisplayOrientation" FullName="Xamarin.Essentials.DisplayOrientation">
+  <TypeSignature Language="C#" Value="public enum DisplayOrientation" />
+  <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed DisplayOrientation extends System.Enum" />
+  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.DisplayOrientation" />
   <AssemblyInfo>
     <AssemblyName>Xamarin.Essentials</AssemblyName>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -10,61 +10,61 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Docs>
-    <summary>Screen orientation.</summary>
+    <summary>Display Orientation</summary>
     <remarks>
-      <para />
+      <para></para>
     </remarks>
   </Docs>
   <Members>
     <Member MemberName="Landscape">
       <MemberSignature Language="C#" Value="Landscape" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.ScreenOrientation Landscape = int32(2)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.ScreenOrientation.Landscape" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.DisplayOrientation Landscape = int32(2)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.DisplayOrientation.Landscape" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>Xamarin.Essentials.ScreenOrientation</ReturnType>
+        <ReturnType>Xamarin.Essentials.DisplayOrientation</ReturnType>
       </ReturnValue>
       <MemberValue>2</MemberValue>
       <Docs>
-        <summary>Screen is in landscape.</summary>
+        <summary>Display is in landscape.</summary>
       </Docs>
     </Member>
     <Member MemberName="Portrait">
       <MemberSignature Language="C#" Value="Portrait" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.ScreenOrientation Portrait = int32(1)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.ScreenOrientation.Portrait" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.DisplayOrientation Portrait = int32(1)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.DisplayOrientation.Portrait" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>Xamarin.Essentials.ScreenOrientation</ReturnType>
+        <ReturnType>Xamarin.Essentials.DisplayOrientation</ReturnType>
       </ReturnValue>
       <MemberValue>1</MemberValue>
       <Docs>
-        <summary>Screen is in portrait.</summary>
+        <summary>Display is in portrait.</summary>
       </Docs>
     </Member>
     <Member MemberName="Unknown">
       <MemberSignature Language="C#" Value="Unknown" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.ScreenOrientation Unknown = int32(0)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.ScreenOrientation.Unknown" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.DisplayOrientation Unknown = int32(0)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.DisplayOrientation.Unknown" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>Xamarin.Essentials.ScreenOrientation</ReturnType>
+        <ReturnType>Xamarin.Essentials.DisplayOrientation</ReturnType>
       </ReturnValue>
       <MemberValue>0</MemberValue>
       <Docs>
-        <summary>Unknown screen orientation.</summary>
+        <summary>Unknown display orientation.</summary>
       </Docs>
     </Member>
   </Members>
diff --git a/docs/en/Xamarin.Essentials/ScreenRotation.xml b/docs/en/Xamarin.Essentials/DisplayRotation.xml
similarity index 58%
rename from docs/en/Xamarin.Essentials/ScreenRotation.xml
rename to docs/en/Xamarin.Essentials/DisplayRotation.xml
index 44b491b74..e83f10423 100644
--- a/docs/en/Xamarin.Essentials/ScreenRotation.xml
+++ b/docs/en/Xamarin.Essentials/DisplayRotation.xml
@@ -1,7 +1,7 @@
-<Type Name="ScreenRotation" FullName="Xamarin.Essentials.ScreenRotation">
-  <TypeSignature Language="C#" Value="public enum ScreenRotation" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed ScreenRotation extends System.Enum" />
-  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.ScreenRotation" />
+<Type Name="DisplayRotation" FullName="Xamarin.Essentials.DisplayRotation">
+  <TypeSignature Language="C#" Value="public enum DisplayRotation" />
+  <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed DisplayRotation extends System.Enum" />
+  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.DisplayRotation" />
   <AssemblyInfo>
     <AssemblyName>Xamarin.Essentials</AssemblyName>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -10,7 +10,7 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Docs>
-    <summary>Screen rotation.</summary>
+    <summary>Display rotation.</summary>
     <remarks>
       <para />
     </remarks>
@@ -18,71 +18,88 @@
   <Members>
     <Member MemberName="Rotation0">
       <MemberSignature Language="C#" Value="Rotation0" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.ScreenRotation Rotation0 = int32(0)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.ScreenRotation.Rotation0" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.DisplayRotation Rotation0 = int32(1)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.DisplayRotation.Rotation0" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>Xamarin.Essentials.ScreenRotation</ReturnType>
+        <ReturnType>Xamarin.Essentials.DisplayRotation</ReturnType>
       </ReturnValue>
-      <MemberValue>0</MemberValue>
+      <MemberValue>1</MemberValue>
       <Docs>
         <summary>Rotated 0 degrees.</summary>
       </Docs>
     </Member>
     <Member MemberName="Rotation180">
       <MemberSignature Language="C#" Value="Rotation180" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.ScreenRotation Rotation180 = int32(2)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.ScreenRotation.Rotation180" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.DisplayRotation Rotation180 = int32(3)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.DisplayRotation.Rotation180" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>Xamarin.Essentials.ScreenRotation</ReturnType>
+        <ReturnType>Xamarin.Essentials.DisplayRotation</ReturnType>
       </ReturnValue>
-      <MemberValue>2</MemberValue>
+      <MemberValue>3</MemberValue>
       <Docs>
         <summary>Rotated 180 degrees.</summary>
       </Docs>
     </Member>
     <Member MemberName="Rotation270">
       <MemberSignature Language="C#" Value="Rotation270" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.ScreenRotation Rotation270 = int32(3)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.ScreenRotation.Rotation270" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.DisplayRotation Rotation270 = int32(4)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.DisplayRotation.Rotation270" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>Xamarin.Essentials.ScreenRotation</ReturnType>
+        <ReturnType>Xamarin.Essentials.DisplayRotation</ReturnType>
       </ReturnValue>
-      <MemberValue>3</MemberValue>
+      <MemberValue>4</MemberValue>
       <Docs>
-        <summary>Rotated 270 degrees.</summary>
+        <summary>Rotated 270 degrees.</summary>
       </Docs>
     </Member>
     <Member MemberName="Rotation90">
       <MemberSignature Language="C#" Value="Rotation90" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.ScreenRotation Rotation90 = int32(1)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.ScreenRotation.Rotation90" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.DisplayRotation Rotation90 = int32(2)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.DisplayRotation.Rotation90" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>Xamarin.Essentials.ScreenRotation</ReturnType>
+        <ReturnType>Xamarin.Essentials.DisplayRotation</ReturnType>
       </ReturnValue>
-      <MemberValue>1</MemberValue>
+      <MemberValue>2</MemberValue>
       <Docs>
         <summary>Rotated 90 degrees.</summary>
       </Docs>
     </Member>
+    <Member MemberName="Unknown">
+      <MemberSignature Language="C#" Value="Unknown" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.DisplayRotation Unknown = int32(0)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.DisplayRotation.Unknown" />
+      <MemberType>Field</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Xamarin.Essentials.DisplayRotation</ReturnType>
+      </ReturnValue>
+      <MemberValue>0</MemberValue>
+      <Docs>
+        <summary>Unknown display rotation.</summary>
+      </Docs>
+    </Member>
   </Members>
 </Type>
diff --git a/docs/en/Xamarin.Essentials/MainDisplayInfoChangedEventArgs.xml b/docs/en/Xamarin.Essentials/MainDisplayInfoChangedEventArgs.xml
new file mode 100644
index 000000000..c6b9df9e9
--- /dev/null
+++ b/docs/en/Xamarin.Essentials/MainDisplayInfoChangedEventArgs.xml
@@ -0,0 +1,57 @@
+<Type Name="MainDisplayInfoChangedEventArgs" FullName="Xamarin.Essentials.MainDisplayInfoChangedEventArgs">
+  <TypeSignature Language="C#" Value="public class MainDisplayInfoChangedEventArgs : EventArgs" />
+  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit MainDisplayInfoChangedEventArgs extends System.EventArgs" />
+  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.MainDisplayInfoChangedEventArgs" />
+  <AssemblyInfo>
+    <AssemblyName>Xamarin.Essentials</AssemblyName>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+  </AssemblyInfo>
+  <Base>
+    <BaseTypeName>System.EventArgs</BaseTypeName>
+  </Base>
+  <Interfaces />
+  <Docs>
+    <summary>Main display information event arguments.</summary>
+    <remarks>
+      <para></para>
+    </remarks>
+  </Docs>
+  <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public MainDisplayInfoChangedEventArgs (Xamarin.Essentials.DisplayInfo mainDisplayInfo);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(valuetype Xamarin.Essentials.DisplayInfo mainDisplayInfo) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.MainDisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters>
+        <Parameter Name="mainDisplayInfo" Type="Xamarin.Essentials.DisplayInfo" Index="0" FrameworkAlternate="xamarin-essentials;xamarin-essentials-android;xamarin-essentials-ios;xamarin-essentials-uwp" />
+      </Parameters>
+      <Docs>
+        <param name="mainDisplayInfo">To be added.</param>
+        <summary>Main constructor for event args.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="MainDisplayInfo">
+      <MemberSignature Language="C#" Value="public Xamarin.Essentials.DisplayInfo MainDisplayInfo { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Essentials.DisplayInfo MainDisplayInfo" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.MainDisplayInfoChangedEventArgs.MainDisplayInfo" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Xamarin.Essentials.DisplayInfo</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Gets the current display info for the main display.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+  </Members>
+</Type>
diff --git a/docs/en/Xamarin.Essentials/ScreenLock.xml b/docs/en/Xamarin.Essentials/ScreenLock.xml
deleted file mode 100644
index d1a33c039..000000000
--- a/docs/en/Xamarin.Essentials/ScreenLock.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<Type Name="ScreenLock" FullName="Xamarin.Essentials.ScreenLock">
-  <TypeSignature Language="C#" Value="public static class ScreenLock" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi abstract sealed beforefieldinit ScreenLock extends System.Object" />
-  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.ScreenLock" />
-  <AssemblyInfo>
-    <AssemblyName>Xamarin.Essentials</AssemblyName>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.Object</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <summary>Provides an easy way to keep the device screen on.</summary>
-    <remarks></remarks>
-  </Docs>
-  <Members>
-    <Member MemberName="IsActive">
-      <MemberSignature Language="C#" Value="public static bool IsActive { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property bool IsActive" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.ScreenLock.IsActive" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>Gets a value that indicates whether the device's screen will stay on.</summary>
-        <value></value>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="RequestActive">
-      <MemberSignature Language="C#" Value="public static void RequestActive ();" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig void RequestActive() cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.ScreenLock.RequestActive" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Indicate that the device's screen should stay on.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="RequestRelease">
-      <MemberSignature Language="C#" Value="public static void RequestRelease ();" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig void RequestRelease() cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.ScreenLock.RequestRelease" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>Indicate that the device's screen can turn off.</summary>
-        <remarks></remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
diff --git a/docs/en/Xamarin.Essentials/ScreenMetricsChangedEventArgs.xml b/docs/en/Xamarin.Essentials/ScreenMetricsChangedEventArgs.xml
deleted file mode 100644
index efa7f5ad1..000000000
--- a/docs/en/Xamarin.Essentials/ScreenMetricsChangedEventArgs.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<Type Name="ScreenMetricsChangedEventArgs" FullName="Xamarin.Essentials.ScreenMetricsChangedEventArgs">
-  <TypeSignature Language="C#" Value="public class ScreenMetricsChangedEventArgs : EventArgs" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit ScreenMetricsChangedEventArgs extends System.EventArgs" />
-  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.ScreenMetricsChangedEventArgs" />
-  <AssemblyInfo>
-    <AssemblyName>Xamarin.Essentials</AssemblyName>
-    <AssemblyVersion>1.0.0.0</AssemblyVersion>
-  </AssemblyInfo>
-  <Base>
-    <BaseTypeName>System.EventArgs</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Docs>
-    <summary>Screen metric event arguments.</summary>
-    <remarks>
-      <para />
-    </remarks>
-  </Docs>
-  <Members>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ScreenMetricsChangedEventArgs (Xamarin.Essentials.ScreenMetrics metrics);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(valuetype Xamarin.Essentials.ScreenMetrics metrics) cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.ScreenMetricsChangedEventArgs.#ctor(Xamarin.Essentials.ScreenMetrics)" />
-      <MemberType>Constructor</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-      </AssemblyInfo>
-      <Parameters>
-        <Parameter Name="metrics" Type="Xamarin.Essentials.ScreenMetrics" />
-      </Parameters>
-      <Docs>
-        <param name="metrics">New screen metrics.</param>
-        <summary>Constructor that takes new screen matrics.</summary>
-        <remarks>
-          <para />
-        </remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Metrics">
-      <MemberSignature Language="C#" Value="public Xamarin.Essentials.ScreenMetrics Metrics { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Essentials.ScreenMetrics Metrics" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.ScreenMetricsChangedEventArgs.Metrics" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>Xamarin.Essentials.ScreenMetrics</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>Gets the new screen metrics.</summary>
-        <value>The screen metrics.</value>
-        <remarks>
-          <para />
-        </remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
diff --git a/docs/en/index.xml b/docs/en/index.xml
index b382713c4..9c729685f 100644
--- a/docs/en/index.xml
+++ b/docs/en/index.xml
@@ -112,6 +112,9 @@
       <Type Name="DeviceInfo" Kind="Class" />
       <Type Name="DevicePlatform" Kind="Structure" />
       <Type Name="DeviceType" Kind="Enumeration" />
+      <Type Name="DisplayInfo" Kind="Structure" />
+      <Type Name="DisplayOrientation" Kind="Enumeration" />
+      <Type Name="DisplayRotation" Kind="Enumeration" />
       <Type Name="DistanceUnits" Kind="Enumeration" />
       <Type Name="Email" Kind="Class" />
       <Type Name="EmailBodyFormat" Kind="Enumeration" />
@@ -136,6 +139,7 @@
       <Type Name="Magnetometer" Kind="Class" />
       <Type Name="MagnetometerChangedEventArgs" Kind="Class" />
       <Type Name="MagnetometerData" Kind="Structure" />
+      <Type Name="MainDisplayInfoChangedEventArgs" Kind="Class" />
       <Type Name="MainThread" Kind="Class" />
       <Type Name="Map" Kind="Class" />
       <Type Name="MapLaunchOptions" Kind="Class" />
@@ -151,11 +155,6 @@
       <Type Name="PlacemarkExtensions" Kind="Class" />
       <Type Name="Platform" Kind="Class" />
       <Type Name="Preferences" Kind="Class" />
-      <Type Name="ScreenLock" Kind="Class" />
-      <Type Name="ScreenMetrics" Kind="Structure" />
-      <Type Name="ScreenMetricsChangedEventArgs" Kind="Class" />
-      <Type Name="ScreenOrientation" Kind="Enumeration" />
-      <Type Name="ScreenRotation" Kind="Enumeration" />
       <Type Name="SecureStorage" Kind="Class" />
       <Type Name="SensorSpeed" Kind="Enumeration" />
       <Type Name="Share" Kind="Class" />

From 7fc2ff92e0af4b2e49a8761059de160bc916e385 Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Mon, 5 Nov 2018 11:00:52 -0800
Subject: [PATCH 25/43] Add device display.

---
 docs/en/Xamarin.Essentials/DeviceDisplay.xml | 54 ++++++++++++++------
 1 file changed, 38 insertions(+), 16 deletions(-)

diff --git a/docs/en/Xamarin.Essentials/DeviceDisplay.xml b/docs/en/Xamarin.Essentials/DeviceDisplay.xml
index 525a9c461..4d99d7751 100644
--- a/docs/en/Xamarin.Essentials/DeviceDisplay.xml
+++ b/docs/en/Xamarin.Essentials/DeviceDisplay.xml
@@ -13,45 +13,67 @@
   <Docs>
     <summary>Represents information about the device screen.</summary>
     <remarks>
-      <para />
+      <para></para>
     </remarks>
   </Docs>
   <Members>
-    <Member MemberName="ScreenMetrics">
-      <MemberSignature Language="C#" Value="public static Xamarin.Essentials.ScreenMetrics ScreenMetrics { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property valuetype Xamarin.Essentials.ScreenMetrics ScreenMetrics" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.DeviceDisplay.ScreenMetrics" />
+    <Member MemberName="KeepScreenOn">
+      <MemberSignature Language="C#" Value="public static bool KeepScreenOn { get; set; }" />
+      <MemberSignature Language="ILAsm" Value=".property bool KeepScreenOn" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.DeviceDisplay.KeepScreenOn" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Gets or sets if the screen shold be kept on.</summary>
+        <value>If the screen keep on is set.</value>
+        <remarks>
+          <para />
+        </remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="MainDisplayInfo">
+      <MemberSignature Language="C#" Value="public static Xamarin.Essentials.DisplayInfo MainDisplayInfo { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property valuetype Xamarin.Essentials.DisplayInfo MainDisplayInfo" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.DeviceDisplay.MainDisplayInfo" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>Xamarin.Essentials.ScreenMetrics</ReturnType>
+        <ReturnType>Xamarin.Essentials.DisplayInfo</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Gets the screen metrics of the device.</summary>
-        <value>The screen metrics.</value>
+        <summary>Gets the main screens display info.</summary>
+        <value>The main screen display info.</value>
         <remarks>
           <para />
         </remarks>
       </Docs>
     </Member>
-    <Member MemberName="ScreenMetricsChanged">
-      <MemberSignature Language="C#" Value="public static event EventHandler&lt;Xamarin.Essentials.ScreenMetricsChangedEventArgs&gt; ScreenMetricsChanged;" />
-      <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class Xamarin.Essentials.ScreenMetricsChangedEventArgs&gt; ScreenMetricsChanged" />
-      <MemberSignature Language="DocId" Value="E:Xamarin.Essentials.DeviceDisplay.ScreenMetricsChanged" />
+    <Member MemberName="MainDisplayInfoChanged">
+      <MemberSignature Language="C#" Value="public static event EventHandler&lt;Xamarin.Essentials.MainDisplayInfoChangedEventArgs&gt; MainDisplayInfoChanged;" />
+      <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class Xamarin.Essentials.MainDisplayInfoChangedEventArgs&gt; MainDisplayInfoChanged" />
+      <MemberSignature Language="DocId" Value="E:Xamarin.Essentials.DeviceDisplay.MainDisplayInfoChanged" />
       <MemberType>Event</MemberType>
       <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>System.EventHandler&lt;Xamarin.Essentials.ScreenMetricsChangedEventArgs&gt;</ReturnType>
+        <ReturnType>System.EventHandler&lt;Xamarin.Essentials.MainDisplayInfoChangedEventArgs&gt;</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Event that is triggered when the screen matrics change.</summary>
-        <remarks>Such as screen rotation.</remarks>
+        <summary>Event that is triggered when the main display info changes.</summary>
+        <remarks>
+          <para />
+        </remarks>
       </Docs>
     </Member>
   </Members>

From e78a8c9ab7259e7e2584863f654d682d9fa974e4 Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Mon, 5 Nov 2018 11:03:45 -0800
Subject: [PATCH 26/43] Change to BatteryInfoChanged and
 BatteryInfoChangedEventArgs

---
 Samples/Samples/ViewModel/BatteryViewModel.cs |  6 ++--
 Tests/Battery_Tests.cs                        |  4 +--
 Xamarin.Essentials/Battery/Battery.android.cs | 10 +++---
 Xamarin.Essentials/Battery/Battery.ios.cs     |  8 ++---
 Xamarin.Essentials/Battery/Battery.shared.cs  | 32 +++++++++----------
 Xamarin.Essentials/Battery/Battery.uwp.cs     |  2 +-
 .../xamarin-essentials-android.xml            | 12 +++----
 .../xamarin-essentials-ios.xml                | 12 +++----
 .../xamarin-essentials-uwp.xml                | 12 +++----
 .../en/FrameworksIndex/xamarin-essentials.xml | 12 +++----
 docs/en/Xamarin.Essentials/Battery.xml        | 10 +++---
 .../BatteryChangedEventArgs.xml               | 16 +++++-----
 docs/en/index.xml                             |  2 +-
 13 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/Samples/Samples/ViewModel/BatteryViewModel.cs b/Samples/Samples/ViewModel/BatteryViewModel.cs
index 0cd492bf2..61f1f01d3 100644
--- a/Samples/Samples/ViewModel/BatteryViewModel.cs
+++ b/Samples/Samples/ViewModel/BatteryViewModel.cs
@@ -20,13 +20,13 @@ public override void OnAppearing()
         {
             base.OnAppearing();
 
-            Battery.BatteryChanged += OnBatteryChanged;
+            Battery.BatteryInfoChanged += OnBatteryInfoChanged;
             Battery.EnergySaverStatusChanged += OnEnergySaverStatusChanged;
         }
 
         public override void OnDisappearing()
         {
-            Battery.BatteryChanged -= OnBatteryChanged;
+            Battery.BatteryInfoChanged -= OnBatteryInfoChanged;
             Battery.EnergySaverStatusChanged -= OnEnergySaverStatusChanged;
 
             base.OnDisappearing();
@@ -37,7 +37,7 @@ void OnEnergySaverStatusChanged(object sender, EnergySaverStatusChangedEventArgs
             OnPropertyChanged(nameof(EnergySaverStatus));
         }
 
-        void OnBatteryChanged(object sender, BatteryChangedEventArgs e)
+        void OnBatteryInfoChanged(object sender, BatteryInfoChangedEventArgs e)
         {
             OnPropertyChanged(nameof(Level));
             OnPropertyChanged(nameof(State));
diff --git a/Tests/Battery_Tests.cs b/Tests/Battery_Tests.cs
index 90721cc46..e049667b1 100644
--- a/Tests/Battery_Tests.cs
+++ b/Tests/Battery_Tests.cs
@@ -19,9 +19,9 @@ public void Charge_Power_Source_On_NetStandard() =>
 
         [Fact]
         public void Battery_Changed_Event_On_NetStandard() =>
-            Assert.Throws<NotImplementedInReferenceAssemblyException>(() => Battery.BatteryChanged += Battery_BatteryChanged);
+            Assert.Throws<NotImplementedInReferenceAssemblyException>(() => Battery.BatteryInfoChanged += Battery_BatteryInfoChanged);
 
-        void Battery_BatteryChanged(object sender, BatteryChangedEventArgs e)
+        void Battery_BatteryInfoChanged(object sender, BatteryInfoChangedEventArgs e)
         {
         }
     }
diff --git a/Xamarin.Essentials/Battery/Battery.android.cs b/Xamarin.Essentials/Battery/Battery.android.cs
index 66eab560b..98d931ec4 100644
--- a/Xamarin.Essentials/Battery/Battery.android.cs
+++ b/Xamarin.Essentials/Battery/Battery.android.cs
@@ -51,8 +51,8 @@ static void StartBatteryListeners()
         {
             Permissions.EnsureDeclared(PermissionType.Battery);
 
-            batteryReceiver = new BatteryBroadcastReceiver(OnBatteryChanged);
-            Platform.AppContext.RegisterReceiver(batteryReceiver, new IntentFilter(Intent.ActionBatteryChanged));
+            batteryReceiver = new BatteryBroadcastReceiver(OnBatteryInfoChanged);
+            Platform.AppContext.RegisterReceiver(batteryReceiver, new IntentFilter(Intent.ActionBatteryInfoChanged));
         }
 
         static void StopBatteryListeners()
@@ -75,7 +75,7 @@ static double PlatformChargeLevel
             {
                 Permissions.EnsureDeclared(PermissionType.Battery);
 
-                using (var filter = new IntentFilter(Intent.ActionBatteryChanged))
+                using (var filter = new IntentFilter(Intent.ActionBatteryInfoChanged))
                 using (var battery = Platform.AppContext.RegisterReceiver(null, filter))
                 {
                     var level = battery.GetIntExtra(BatteryManager.ExtraLevel, -1);
@@ -95,7 +95,7 @@ static BatteryState PlatformState
             {
                 Permissions.EnsureDeclared(PermissionType.Battery);
 
-                using (var filter = new IntentFilter(Intent.ActionBatteryChanged))
+                using (var filter = new IntentFilter(Intent.ActionBatteryInfoChanged))
                 using (var battery = Platform.AppContext.RegisterReceiver(null, filter))
                 {
                     var status = battery.GetIntExtra(BatteryManager.ExtraStatus, -1);
@@ -122,7 +122,7 @@ static BatteryPowerSource PlatformPowerSource
             {
                 Permissions.EnsureDeclared(PermissionType.Battery);
 
-                using (var filter = new IntentFilter(Intent.ActionBatteryChanged))
+                using (var filter = new IntentFilter(Intent.ActionBatteryInfoChanged))
                 using (var battery = Platform.AppContext.RegisterReceiver(null, filter))
                 {
                     var chargePlug = battery.GetIntExtra(BatteryManager.ExtraPlugged, -1);
diff --git a/Xamarin.Essentials/Battery/Battery.ios.cs b/Xamarin.Essentials/Battery/Battery.ios.cs
index 2296ae98d..3d371ca9c 100644
--- a/Xamarin.Essentials/Battery/Battery.ios.cs
+++ b/Xamarin.Essentials/Battery/Battery.ios.cs
@@ -29,8 +29,8 @@ static void PowerChangedNotification(NSNotification notification)
         static void StartBatteryListeners()
         {
             UIDevice.CurrentDevice.BatteryMonitoringEnabled = true;
-            levelObserver = UIDevice.Notifications.ObserveBatteryLevelDidChange(BatteryChangedNotification);
-            stateObserver = UIDevice.Notifications.ObserveBatteryStateDidChange(BatteryChangedNotification);
+            levelObserver = UIDevice.Notifications.ObserveBatteryLevelDidChange(BatteryInfoChangedNotification);
+            stateObserver = UIDevice.Notifications.ObserveBatteryStateDidChange(BatteryInfoChangedNotification);
         }
 
         static void StopBatteryListeners()
@@ -42,8 +42,8 @@ static void StopBatteryListeners()
             stateObserver = null;
         }
 
-        static void BatteryChangedNotification(object sender, NSNotificationEventArgs args)
-            => MainThread.BeginInvokeOnMainThread(OnBatteryChanged);
+        static void BatteryInfoChangedNotification(object sender, NSNotificationEventArgs args)
+            => MainThread.BeginInvokeOnMainThread(OnBatteryInfoChanged);
 
         static double PlatformChargeLevel
         {
diff --git a/Xamarin.Essentials/Battery/Battery.shared.cs b/Xamarin.Essentials/Battery/Battery.shared.cs
index a4e980fc0..357c223a0 100644
--- a/Xamarin.Essentials/Battery/Battery.shared.cs
+++ b/Xamarin.Essentials/Battery/Battery.shared.cs
@@ -4,7 +4,7 @@ namespace Xamarin.Essentials
 {
     public static partial class Battery
     {
-        static event EventHandler<BatteryChangedEventArgs> BatteryChangedInternal;
+        static event EventHandler<BatteryInfoChangedEventArgs> BatteryInfoChangedInternal;
 
         static event EventHandler<EnergySaverStatusChangedEventArgs> EnergySaverStatusChangedInternal;
 
@@ -22,15 +22,15 @@ public static partial class Battery
 
         public static EnergySaverStatus EnergySaverStatus => PlatformEnergySaverStatus;
 
-        public static event EventHandler<BatteryChangedEventArgs> BatteryChanged
+        public static event EventHandler<BatteryInfoChangedEventArgs> BatteryInfoChanged
         {
             add
             {
-                var wasRunning = BatteryChangedInternal != null;
+                var wasRunning = BatteryInfoChangedInternal != null;
 
-                BatteryChangedInternal += value;
+                BatteryInfoChangedInternal += value;
 
-                if (!wasRunning && BatteryChangedInternal != null)
+                if (!wasRunning && BatteryInfoChangedInternal != null)
                 {
                     SetCurrent();
                     StartBatteryListeners();
@@ -39,11 +39,11 @@ public static event EventHandler<BatteryChangedEventArgs> BatteryChanged
 
             remove
             {
-                var wasRunning = BatteryChangedInternal != null;
+                var wasRunning = BatteryInfoChangedInternal != null;
 
-                BatteryChangedInternal -= value;
+                BatteryInfoChangedInternal -= value;
 
-                if (wasRunning && BatteryChangedInternal == null)
+                if (wasRunning && BatteryInfoChangedInternal == null)
                     StopBatteryListeners();
             }
         }
@@ -78,18 +78,18 @@ static void SetCurrent()
             currentState = Battery.State;
         }
 
-        static void OnBatteryChanged(double level, BatteryState state, BatteryPowerSource source)
-            => OnBatteryChanged(new BatteryChangedEventArgs(level, state, source));
+        static void OnBatteryInfoChanged(double level, BatteryState state, BatteryPowerSource source)
+            => OnBatteryInfoChanged(new BatteryInfoChangedEventArgs(level, state, source));
 
-        static void OnBatteryChanged()
-            => OnBatteryChanged(ChargeLevel, State, PowerSource);
+        static void OnBatteryInfoChanged()
+            => OnBatteryInfoChanged(ChargeLevel, State, PowerSource);
 
-        static void OnBatteryChanged(BatteryChangedEventArgs e)
+        static void OnBatteryInfoChanged(BatteryInfoChangedEventArgs e)
         {
             if (currentLevel != e.ChargeLevel || currentSource != e.PowerSource || currentState != e.State)
             {
                 SetCurrent();
-                BatteryChangedInternal?.Invoke(null, e);
+                BatteryInfoChangedInternal?.Invoke(null, e);
             }
         }
 
@@ -129,9 +129,9 @@ public enum EnergySaverStatus
         Off
     }
 
-    public class BatteryChangedEventArgs : EventArgs
+    public class BatteryInfoChangedEventArgs : EventArgs
     {
-        internal BatteryChangedEventArgs(double level, BatteryState state, BatteryPowerSource source)
+        internal BatteryInfoChangedEventArgs(double level, BatteryState state, BatteryPowerSource source)
         {
             ChargeLevel = level;
             State = state;
diff --git a/Xamarin.Essentials/Battery/Battery.uwp.cs b/Xamarin.Essentials/Battery/Battery.uwp.cs
index 93c5856a5..ab91b6c7b 100644
--- a/Xamarin.Essentials/Battery/Battery.uwp.cs
+++ b/Xamarin.Essentials/Battery/Battery.uwp.cs
@@ -20,7 +20,7 @@ static void StopBatteryListeners() =>
             DefaultBattery.ReportUpdated -= ReportUpdated;
 
         static void ReportUpdated(object sender, object e)
-            => MainThread.BeginInvokeOnMainThread(OnBatteryChanged);
+            => MainThread.BeginInvokeOnMainThread(OnBatteryInfoChanged);
 
         static Windows.Devices.Power.Battery DefaultBattery =>
             Windows.Devices.Power.Battery.AggregateBattery;
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-android.xml b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
index 5aaa367b3..3050693ee 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-android.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
@@ -48,18 +48,18 @@
       <Member Id="P:Xamarin.Essentials.BarometerData.Pressure" />
     </Type>
     <Type Name="Xamarin.Essentials.Battery" Id="T:Xamarin.Essentials.Battery">
-      <Member Id="E:Xamarin.Essentials.Battery.BatteryChanged" />
+      <Member Id="E:Xamarin.Essentials.Battery.BatteryInfoChanged" />
       <Member Id="E:Xamarin.Essentials.Battery.EnergySaverStatusChanged" />
       <Member Id="P:Xamarin.Essentials.Battery.ChargeLevel" />
       <Member Id="P:Xamarin.Essentials.Battery.EnergySaverStatus" />
       <Member Id="P:Xamarin.Essentials.Battery.PowerSource" />
       <Member Id="P:Xamarin.Essentials.Battery.State" />
     </Type>
-    <Type Name="Xamarin.Essentials.BatteryChangedEventArgs" Id="T:Xamarin.Essentials.BatteryChangedEventArgs">
-      <Member Id="M:Xamarin.Essentials.BatteryChangedEventArgs.ToString" />
-      <Member Id="P:Xamarin.Essentials.BatteryChangedEventArgs.ChargeLevel" />
-      <Member Id="P:Xamarin.Essentials.BatteryChangedEventArgs.PowerSource" />
-      <Member Id="P:Xamarin.Essentials.BatteryChangedEventArgs.State" />
+    <Type Name="Xamarin.Essentials.BatteryInfoChangedEventArgs" Id="T:Xamarin.Essentials.BatteryInfoChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.BatteryInfoChangedEventArgs.ToString" />
+      <Member Id="P:Xamarin.Essentials.BatteryInfoChangedEventArgs.ChargeLevel" />
+      <Member Id="P:Xamarin.Essentials.BatteryInfoChangedEventArgs.PowerSource" />
+      <Member Id="P:Xamarin.Essentials.BatteryInfoChangedEventArgs.State" />
     </Type>
     <Type Name="Xamarin.Essentials.BatteryPowerSource" Id="T:Xamarin.Essentials.BatteryPowerSource">
       <Member Id="F:Xamarin.Essentials.BatteryPowerSource.AC" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
index 03fe6d94b..3c9ba650f 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
@@ -48,18 +48,18 @@
       <Member Id="P:Xamarin.Essentials.BarometerData.Pressure" />
     </Type>
     <Type Name="Xamarin.Essentials.Battery" Id="T:Xamarin.Essentials.Battery">
-      <Member Id="E:Xamarin.Essentials.Battery.BatteryChanged" />
+      <Member Id="E:Xamarin.Essentials.Battery.BatteryInfoChanged" />
       <Member Id="E:Xamarin.Essentials.Battery.EnergySaverStatusChanged" />
       <Member Id="P:Xamarin.Essentials.Battery.ChargeLevel" />
       <Member Id="P:Xamarin.Essentials.Battery.EnergySaverStatus" />
       <Member Id="P:Xamarin.Essentials.Battery.PowerSource" />
       <Member Id="P:Xamarin.Essentials.Battery.State" />
     </Type>
-    <Type Name="Xamarin.Essentials.BatteryChangedEventArgs" Id="T:Xamarin.Essentials.BatteryChangedEventArgs">
-      <Member Id="M:Xamarin.Essentials.BatteryChangedEventArgs.ToString" />
-      <Member Id="P:Xamarin.Essentials.BatteryChangedEventArgs.ChargeLevel" />
-      <Member Id="P:Xamarin.Essentials.BatteryChangedEventArgs.PowerSource" />
-      <Member Id="P:Xamarin.Essentials.BatteryChangedEventArgs.State" />
+    <Type Name="Xamarin.Essentials.BatteryInfoChangedEventArgs" Id="T:Xamarin.Essentials.BatteryInfoChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.BatteryInfoChangedEventArgs.ToString" />
+      <Member Id="P:Xamarin.Essentials.BatteryInfoChangedEventArgs.ChargeLevel" />
+      <Member Id="P:Xamarin.Essentials.BatteryInfoChangedEventArgs.PowerSource" />
+      <Member Id="P:Xamarin.Essentials.BatteryInfoChangedEventArgs.State" />
     </Type>
     <Type Name="Xamarin.Essentials.BatteryPowerSource" Id="T:Xamarin.Essentials.BatteryPowerSource">
       <Member Id="F:Xamarin.Essentials.BatteryPowerSource.AC" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
index d5eab06df..518c669b4 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
@@ -48,18 +48,18 @@
       <Member Id="P:Xamarin.Essentials.BarometerData.Pressure" />
     </Type>
     <Type Name="Xamarin.Essentials.Battery" Id="T:Xamarin.Essentials.Battery">
-      <Member Id="E:Xamarin.Essentials.Battery.BatteryChanged" />
+      <Member Id="E:Xamarin.Essentials.Battery.BatteryInfoChanged" />
       <Member Id="E:Xamarin.Essentials.Battery.EnergySaverStatusChanged" />
       <Member Id="P:Xamarin.Essentials.Battery.ChargeLevel" />
       <Member Id="P:Xamarin.Essentials.Battery.EnergySaverStatus" />
       <Member Id="P:Xamarin.Essentials.Battery.PowerSource" />
       <Member Id="P:Xamarin.Essentials.Battery.State" />
     </Type>
-    <Type Name="Xamarin.Essentials.BatteryChangedEventArgs" Id="T:Xamarin.Essentials.BatteryChangedEventArgs">
-      <Member Id="M:Xamarin.Essentials.BatteryChangedEventArgs.ToString" />
-      <Member Id="P:Xamarin.Essentials.BatteryChangedEventArgs.ChargeLevel" />
-      <Member Id="P:Xamarin.Essentials.BatteryChangedEventArgs.PowerSource" />
-      <Member Id="P:Xamarin.Essentials.BatteryChangedEventArgs.State" />
+    <Type Name="Xamarin.Essentials.BatteryInfoChangedEventArgs" Id="T:Xamarin.Essentials.BatteryInfoChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.BatteryInfoChangedEventArgs.ToString" />
+      <Member Id="P:Xamarin.Essentials.BatteryInfoChangedEventArgs.ChargeLevel" />
+      <Member Id="P:Xamarin.Essentials.BatteryInfoChangedEventArgs.PowerSource" />
+      <Member Id="P:Xamarin.Essentials.BatteryInfoChangedEventArgs.State" />
     </Type>
     <Type Name="Xamarin.Essentials.BatteryPowerSource" Id="T:Xamarin.Essentials.BatteryPowerSource">
       <Member Id="F:Xamarin.Essentials.BatteryPowerSource.AC" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials.xml b/docs/en/FrameworksIndex/xamarin-essentials.xml
index e8d39e53d..d570fbc9a 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials.xml
@@ -48,18 +48,18 @@
       <Member Id="P:Xamarin.Essentials.BarometerData.Pressure" />
     </Type>
     <Type Name="Xamarin.Essentials.Battery" Id="T:Xamarin.Essentials.Battery">
-      <Member Id="E:Xamarin.Essentials.Battery.BatteryChanged" />
+      <Member Id="E:Xamarin.Essentials.Battery.BatteryInfoChanged" />
       <Member Id="E:Xamarin.Essentials.Battery.EnergySaverStatusChanged" />
       <Member Id="P:Xamarin.Essentials.Battery.ChargeLevel" />
       <Member Id="P:Xamarin.Essentials.Battery.EnergySaverStatus" />
       <Member Id="P:Xamarin.Essentials.Battery.PowerSource" />
       <Member Id="P:Xamarin.Essentials.Battery.State" />
     </Type>
-    <Type Name="Xamarin.Essentials.BatteryChangedEventArgs" Id="T:Xamarin.Essentials.BatteryChangedEventArgs">
-      <Member Id="M:Xamarin.Essentials.BatteryChangedEventArgs.ToString" />
-      <Member Id="P:Xamarin.Essentials.BatteryChangedEventArgs.ChargeLevel" />
-      <Member Id="P:Xamarin.Essentials.BatteryChangedEventArgs.PowerSource" />
-      <Member Id="P:Xamarin.Essentials.BatteryChangedEventArgs.State" />
+    <Type Name="Xamarin.Essentials.BatteryInfoChangedEventArgs" Id="T:Xamarin.Essentials.BatteryInfoChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.BatteryInfoChangedEventArgs.ToString" />
+      <Member Id="P:Xamarin.Essentials.BatteryInfoChangedEventArgs.ChargeLevel" />
+      <Member Id="P:Xamarin.Essentials.BatteryInfoChangedEventArgs.PowerSource" />
+      <Member Id="P:Xamarin.Essentials.BatteryInfoChangedEventArgs.State" />
     </Type>
     <Type Name="Xamarin.Essentials.BatteryPowerSource" Id="T:Xamarin.Essentials.BatteryPowerSource">
       <Member Id="F:Xamarin.Essentials.BatteryPowerSource.AC" />
diff --git a/docs/en/Xamarin.Essentials/Battery.xml b/docs/en/Xamarin.Essentials/Battery.xml
index f93b34f1a..06185f8bc 100644
--- a/docs/en/Xamarin.Essentials/Battery.xml
+++ b/docs/en/Xamarin.Essentials/Battery.xml
@@ -20,17 +20,17 @@
     </remarks>
   </Docs>
   <Members>
-    <Member MemberName="BatteryChanged">
-      <MemberSignature Language="C#" Value="public static event EventHandler&lt;Xamarin.Essentials.BatteryChangedEventArgs&gt; BatteryChanged;" />
-      <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class Xamarin.Essentials.BatteryChangedEventArgs&gt; BatteryChanged" />
-      <MemberSignature Language="DocId" Value="E:Xamarin.Essentials.Battery.BatteryChanged" />
+    <Member MemberName="BatteryInfoChanged">
+      <MemberSignature Language="C#" Value="public static event EventHandler&lt;Xamarin.Essentials.BatteryInfoChangedEventArgs&gt; BatteryInfoChanged;" />
+      <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class Xamarin.Essentials.BatteryInfoChangedEventArgs&gt; BatteryInfoChanged" />
+      <MemberSignature Language="DocId" Value="E:Xamarin.Essentials.Battery.BatteryInfoChanged" />
       <MemberType>Event</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>System.EventHandler&lt;Xamarin.Essentials.BatteryChangedEventArgs&gt;</ReturnType>
+        <ReturnType>System.EventHandler&lt;Xamarin.Essentials.BatteryInfoChangedEventArgs&gt;</ReturnType>
       </ReturnValue>
       <Docs>
         <summary>Event trigger when battery properties have changed.</summary>
diff --git a/docs/en/Xamarin.Essentials/BatteryChangedEventArgs.xml b/docs/en/Xamarin.Essentials/BatteryChangedEventArgs.xml
index 4da1c42d3..af28d5361 100644
--- a/docs/en/Xamarin.Essentials/BatteryChangedEventArgs.xml
+++ b/docs/en/Xamarin.Essentials/BatteryChangedEventArgs.xml
@@ -1,7 +1,7 @@
-<Type Name="BatteryChangedEventArgs" FullName="Xamarin.Essentials.BatteryChangedEventArgs">
-  <TypeSignature Language="C#" Value="public class BatteryChangedEventArgs : EventArgs" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit BatteryChangedEventArgs extends System.EventArgs" />
-  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.BatteryChangedEventArgs" />
+<Type Name="BatteryInfoChangedEventArgs" FullName="Xamarin.Essentials.BatteryInfoChangedEventArgs">
+  <TypeSignature Language="C#" Value="public class BatteryInfoChangedEventArgs : EventArgs" />
+  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit BatteryInfoChangedEventArgs extends System.EventArgs" />
+  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.BatteryInfoChangedEventArgs" />
   <AssemblyInfo>
     <AssemblyName>Xamarin.Essentials</AssemblyName>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -18,7 +18,7 @@
     <Member MemberName="ChargeLevel">
       <MemberSignature Language="C#" Value="public double ChargeLevel { get; }" />
       <MemberSignature Language="ILAsm" Value=".property instance float64 ChargeLevel" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.BatteryChangedEventArgs.ChargeLevel" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.BatteryInfoChangedEventArgs.ChargeLevel" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -36,7 +36,7 @@
     <Member MemberName="PowerSource">
       <MemberSignature Language="C#" Value="public Xamarin.Essentials.BatteryPowerSource PowerSource { get; }" />
       <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Essentials.BatteryPowerSource PowerSource" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.BatteryChangedEventArgs.PowerSource" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.BatteryInfoChangedEventArgs.PowerSource" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -54,7 +54,7 @@
     <Member MemberName="State">
       <MemberSignature Language="C#" Value="public Xamarin.Essentials.BatteryState State { get; }" />
       <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Essentials.BatteryState State" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.BatteryChangedEventArgs.State" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.BatteryInfoChangedEventArgs.State" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -72,7 +72,7 @@
     <Member MemberName="ToString">
       <MemberSignature Language="C#" Value="public override string ToString ();" />
       <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance string ToString() cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.BatteryChangedEventArgs.ToString" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.BatteryInfoChangedEventArgs.ToString" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
diff --git a/docs/en/index.xml b/docs/en/index.xml
index b382713c4..142f00619 100644
--- a/docs/en/index.xml
+++ b/docs/en/index.xml
@@ -95,7 +95,7 @@
       <Type Name="BarometerChangedEventArgs" Kind="Class" />
       <Type Name="BarometerData" Kind="Structure" />
       <Type Name="Battery" Kind="Class" />
-      <Type Name="BatteryChangedEventArgs" Kind="Class" />
+      <Type Name="BatteryInfoChangedEventArgs" Kind="Class" />
       <Type Name="BatteryPowerSource" Kind="Enumeration" />
       <Type Name="BatteryState" Kind="Enumeration" />
       <Type Name="Browser" Kind="Class" />

From 8fd2f9aac466b77863dd419cc80863550e0f0692 Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Mon, 5 Nov 2018 11:11:43 -0800
Subject: [PATCH 27/43] Revert back battery intent

---
 Xamarin.Essentials/Battery/Battery.android.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Xamarin.Essentials/Battery/Battery.android.cs b/Xamarin.Essentials/Battery/Battery.android.cs
index 98d931ec4..a1fbe4245 100644
--- a/Xamarin.Essentials/Battery/Battery.android.cs
+++ b/Xamarin.Essentials/Battery/Battery.android.cs
@@ -122,7 +122,7 @@ static BatteryPowerSource PlatformPowerSource
             {
                 Permissions.EnsureDeclared(PermissionType.Battery);
 
-                using (var filter = new IntentFilter(Intent.ActionBatteryInfoChanged))
+                using (var filter = new IntentFilter(Intent.ActionBatteryChanged))
                 using (var battery = Platform.AppContext.RegisterReceiver(null, filter))
                 {
                     var chargePlug = battery.GetIntExtra(BatteryManager.ExtraPlugged, -1);

From 07396109a09a687e5412c9378247a31472d31779 Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Mon, 5 Nov 2018 12:01:39 -0800
Subject: [PATCH 28/43] If we can't unwrap the key, then tear down everything
 and start over again.

---
 .../DeviceTests.Shared/SecureStorage_Tests.cs | 31 ++++++++++++++++++
 .../SecureStorage/SecureStorage.android.cs    | 32 +++++++++++--------
 2 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/DeviceTests/DeviceTests.Shared/SecureStorage_Tests.cs b/DeviceTests/DeviceTests.Shared/SecureStorage_Tests.cs
index 01bf35d95..5f616d27d 100644
--- a/DeviceTests/DeviceTests.Shared/SecureStorage_Tests.cs
+++ b/DeviceTests/DeviceTests.Shared/SecureStorage_Tests.cs
@@ -6,6 +6,11 @@ namespace DeviceTests
 {
     public class SecureStorage_Tests
     {
+        public SecureStorage_Tests()
+        {
+            SecureStorage.RemoveAll();
+        }
+
         [Theory]
         [InlineData("test.txt", "data", true, true)]
         [InlineData("noextension", "data2", true, false)]
@@ -40,6 +45,32 @@ public async Task Saves_And_Loads(string key, string data, bool emulatePreApi23,
             Assert.Equal(data, c);
         }
 
+#if __ANDROID__
+        [Theory]
+        [InlineData("test.txt", "data")]
+        public async Task Fix_Corrupt_Key(string key, string data)
+        {
+            // set a valid key
+            SecureStorage.AlwaysUseAsymmetricKeyStorage = true;
+            await SecureStorage.SetAsync(key, data);
+
+            // simulate corrupt the key
+            var prefKey = "SecureStorageKey";
+            var mainKey = "B2PfJSNdEDjM+422tpu7FqFcVQQbO3ti/DvnDnIqrq9CFwaBi6NdXYcicjvMW6nF7X/Clpto5xerM41U1H4qtWJDO0Ijc5QNTHGZl9tDSbXJ6yDCDDnEDryj2uTa8DiHoNcNX68QtcV3at4kkJKXXAwZXSC88a73/xDdh1u5gUdCeXJzVc5vOY6QpAGUH0bjR5NHrqEQNNGDdquFGN9n2ZJPsEK6C9fx0QwCIL+uldpAYSWrpmUIr+/0X7Y0mJpN84ldygEVxHLBuVrzB4Bbu5XGLUN/0Sr2plWcKm7XhM6wp3JRW6Eae2ozys42p1YLeM0HXWrhTqP6FRPkS6mOtw==";
+
+            Preferences.Set(prefKey, mainKey, SecureStorage.Alias);
+
+            var c = await SecureStorage.GetAsync(key);
+            Assert.Null(c);
+
+            // try to reset and get again
+            await SecureStorage.SetAsync(key, data);
+            c = await SecureStorage.GetAsync(key);
+
+            Assert.Equal(data, c);
+        }
+#endif
+
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
diff --git a/Xamarin.Essentials/SecureStorage/SecureStorage.android.cs b/Xamarin.Essentials/SecureStorage/SecureStorage.android.cs
index 20fde9c2c..212494181 100644
--- a/Xamarin.Essentials/SecureStorage/SecureStorage.android.cs
+++ b/Xamarin.Essentials/SecureStorage/SecureStorage.android.cs
@@ -33,7 +33,7 @@ static Task<string> PlatformGetAsync(string key)
                 catch (AEADBadTagException)
                 {
                     System.Diagnostics.Debug.WriteLine($"Unable to decrypt key, {key}, which is likely due to an app uninstall. Removing old key and returning null.");
-                    PlatformRemove(key);
+                    Remove(key);
                 }
             }
 
@@ -122,24 +122,30 @@ ISecretKey GetKey()
 
             if (!string.IsNullOrEmpty(existingKeyStr))
             {
-                var wrappedKey = Convert.FromBase64String(existingKeyStr);
+                try
+                {
+                    var wrappedKey = Convert.FromBase64String(existingKeyStr);
 
-                var unwrappedKey = UnwrapKey(wrappedKey, keyPair.Private);
-                var kp = unwrappedKey.JavaCast<ISecretKey>();
+                    var unwrappedKey = UnwrapKey(wrappedKey, keyPair.Private);
+                    var kp = unwrappedKey.JavaCast<ISecretKey>();
 
-                return kp;
+                    return kp;
+                }
+                catch (Exception ex)
+                {
+                    System.Diagnostics.Debug.WriteLine($"Unable to unwrap key. This may be caused by system backup or upgrades. All secure storage items will now be removed. {ex.Message}");
+                    SecureStorage.RemoveAll();
+                }
             }
-            else
-            {
-                var keyGenerator = KeyGenerator.GetInstance(aesAlgorithm);
-                var defSymmetricKey = keyGenerator.GenerateKey();
 
-                var wrappedKey = WrapKey(defSymmetricKey, keyPair.Public);
+            var keyGenerator = KeyGenerator.GetInstance(aesAlgorithm);
+            var defSymmetricKey = keyGenerator.GenerateKey();
 
-                Preferences.Set(prefsMasterKey, Convert.ToBase64String(wrappedKey), alias);
+            var newWrappedKey = WrapKey(defSymmetricKey, keyPair.Public);
 
-                return defSymmetricKey;
-            }
+            Preferences.Set(prefsMasterKey, Convert.ToBase64String(newWrappedKey), alias);
+
+            return defSymmetricKey;
         }
 
         // API 23+ Only

From ba23b0fc697c1f8c409c80965267e9af99650938 Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Mon, 5 Nov 2018 12:13:13 -0800
Subject: [PATCH 29/43] Change back to "DisplayInfoChangedEventArgs"

---
 .../Samples/ViewModel/DeviceInfoViewModel.cs  |  4 ++--
 .../DeviceDisplay/DeviceDisplay.shared.cs     | 20 +++++++++----------
 .../xamarin-essentials-android.xml            |  6 +++---
 .../xamarin-essentials-ios.xml                |  6 +++---
 .../xamarin-essentials-uwp.xml                |  6 +++---
 .../en/FrameworksIndex/xamarin-essentials.xml |  6 +++---
 docs/en/Xamarin.Essentials/DeviceDisplay.xml  |  6 +++---
 .../MainDisplayInfoChangedEventArgs.xml       | 14 ++++++-------
 docs/en/index.xml                             |  2 +-
 9 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/Samples/Samples/ViewModel/DeviceInfoViewModel.cs b/Samples/Samples/ViewModel/DeviceInfoViewModel.cs
index 30df56e47..6fab032d8 100644
--- a/Samples/Samples/ViewModel/DeviceInfoViewModel.cs
+++ b/Samples/Samples/ViewModel/DeviceInfoViewModel.cs
@@ -43,9 +43,9 @@ public override void OnDisappearing()
             base.OnDisappearing();
         }
 
-        void OnScreenMetricsChanged(object sender, MainDisplayInfoChangedEventArgs e)
+        void OnScreenMetricsChanged(object sender, DisplayInfoChangedEventArgs e)
         {
-            ScreenMetrics = e.MainDisplayInfo;
+            ScreenMetrics = e.DisplayInfo;
         }
     }
 }
diff --git a/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.shared.cs b/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.shared.cs
index c06d05dbb..7583ccac9 100644
--- a/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.shared.cs
+++ b/Xamarin.Essentials/DeviceDisplay/DeviceDisplay.shared.cs
@@ -4,7 +4,7 @@ namespace Xamarin.Essentials
 {
     public static partial class DeviceDisplay
     {
-        static event EventHandler<MainDisplayInfoChangedEventArgs> MainDisplayInfoChangedInternal;
+        static event EventHandler<DisplayInfoChangedEventArgs> MainDisplayInfoChangedInternal;
 
         static DisplayInfo currentMetrics;
 
@@ -19,7 +19,7 @@ public static bool KeepScreenOn
         static void SetCurrent(DisplayInfo metrics) =>
             currentMetrics = new DisplayInfo(metrics.Width, metrics.Height, metrics.Density, metrics.Orientation, metrics.Rotation);
 
-        public static event EventHandler<MainDisplayInfoChangedEventArgs> MainDisplayInfoChanged
+        public static event EventHandler<DisplayInfoChangedEventArgs> MainDisplayInfoChanged
         {
             add
             {
@@ -46,23 +46,23 @@ public static event EventHandler<MainDisplayInfoChangedEventArgs> MainDisplayInf
         }
 
         static void OnMainDisplayInfoChanged(DisplayInfo metrics)
-            => OnMainDisplayInfoChanged(new MainDisplayInfoChangedEventArgs(metrics));
+            => OnMainDisplayInfoChanged(new DisplayInfoChangedEventArgs(metrics));
 
-        static void OnMainDisplayInfoChanged(MainDisplayInfoChangedEventArgs e)
+        static void OnMainDisplayInfoChanged(DisplayInfoChangedEventArgs e)
         {
-            if (!currentMetrics.Equals(e.MainDisplayInfo))
+            if (!currentMetrics.Equals(e.DisplayInfo))
             {
-                SetCurrent(e.MainDisplayInfo);
+                SetCurrent(e.DisplayInfo);
                 MainDisplayInfoChangedInternal?.Invoke(null, e);
             }
         }
     }
 
-    public class MainDisplayInfoChangedEventArgs : EventArgs
+    public class DisplayInfoChangedEventArgs : EventArgs
     {
-        public MainDisplayInfoChangedEventArgs(DisplayInfo mainDisplayInfo) =>
-            MainDisplayInfo = mainDisplayInfo;
+        public DisplayInfoChangedEventArgs(DisplayInfo displayInfo) =>
+            DisplayInfo = displayInfo;
 
-        public DisplayInfo MainDisplayInfo { get; }
+        public DisplayInfo DisplayInfo { get; }
     }
 }
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-android.xml b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
index 1513e7765..524e556f7 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-android.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
@@ -352,9 +352,9 @@
       <Member Id="M:Xamarin.Essentials.MagnetometerData.ToString" />
       <Member Id="P:Xamarin.Essentials.MagnetometerData.MagneticField" />
     </Type>
-    <Type Name="Xamarin.Essentials.MainDisplayInfoChangedEventArgs" Id="T:Xamarin.Essentials.MainDisplayInfoChangedEventArgs">
-      <Member Id="M:Xamarin.Essentials.MainDisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
-      <Member Id="P:Xamarin.Essentials.MainDisplayInfoChangedEventArgs.MainDisplayInfo" />
+    <Type Name="Xamarin.Essentials.DisplayInfoChangedEventArgs" Id="T:Xamarin.Essentials.DisplayInfoChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.DisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfoChangedEventArgs.DisplayInfo" />
     </Type>
     <Type Name="Xamarin.Essentials.MainThread" Id="T:Xamarin.Essentials.MainThread">
       <Member Id="M:Xamarin.Essentials.MainThread.BeginInvokeOnMainThread(System.Action)" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
index 7eece042c..640ca12af 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
@@ -353,9 +353,9 @@
       <Member Id="M:Xamarin.Essentials.MagnetometerData.ToString" />
       <Member Id="P:Xamarin.Essentials.MagnetometerData.MagneticField" />
     </Type>
-    <Type Name="Xamarin.Essentials.MainDisplayInfoChangedEventArgs" Id="T:Xamarin.Essentials.MainDisplayInfoChangedEventArgs">
-      <Member Id="M:Xamarin.Essentials.MainDisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
-      <Member Id="P:Xamarin.Essentials.MainDisplayInfoChangedEventArgs.MainDisplayInfo" />
+    <Type Name="Xamarin.Essentials.DisplayInfoChangedEventArgs" Id="T:Xamarin.Essentials.DisplayInfoChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.DisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfoChangedEventArgs.DisplayInfo" />
     </Type>
     <Type Name="Xamarin.Essentials.MainThread" Id="T:Xamarin.Essentials.MainThread">
       <Member Id="M:Xamarin.Essentials.MainThread.BeginInvokeOnMainThread(System.Action)" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
index a35f964b4..0da6fef04 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
@@ -352,9 +352,9 @@
       <Member Id="M:Xamarin.Essentials.MagnetometerData.ToString" />
       <Member Id="P:Xamarin.Essentials.MagnetometerData.MagneticField" />
     </Type>
-    <Type Name="Xamarin.Essentials.MainDisplayInfoChangedEventArgs" Id="T:Xamarin.Essentials.MainDisplayInfoChangedEventArgs">
-      <Member Id="M:Xamarin.Essentials.MainDisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
-      <Member Id="P:Xamarin.Essentials.MainDisplayInfoChangedEventArgs.MainDisplayInfo" />
+    <Type Name="Xamarin.Essentials.DisplayInfoChangedEventArgs" Id="T:Xamarin.Essentials.DisplayInfoChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.DisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfoChangedEventArgs.DisplayInfo" />
     </Type>
     <Type Name="Xamarin.Essentials.MainThread" Id="T:Xamarin.Essentials.MainThread">
       <Member Id="M:Xamarin.Essentials.MainThread.BeginInvokeOnMainThread(System.Action)" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials.xml b/docs/en/FrameworksIndex/xamarin-essentials.xml
index 66b106148..d8ba041ab 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials.xml
@@ -352,9 +352,9 @@
       <Member Id="M:Xamarin.Essentials.MagnetometerData.ToString" />
       <Member Id="P:Xamarin.Essentials.MagnetometerData.MagneticField" />
     </Type>
-    <Type Name="Xamarin.Essentials.MainDisplayInfoChangedEventArgs" Id="T:Xamarin.Essentials.MainDisplayInfoChangedEventArgs">
-      <Member Id="M:Xamarin.Essentials.MainDisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
-      <Member Id="P:Xamarin.Essentials.MainDisplayInfoChangedEventArgs.MainDisplayInfo" />
+    <Type Name="Xamarin.Essentials.DisplayInfoChangedEventArgs" Id="T:Xamarin.Essentials.DisplayInfoChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.DisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfoChangedEventArgs.DisplayInfo" />
     </Type>
     <Type Name="Xamarin.Essentials.MainThread" Id="T:Xamarin.Essentials.MainThread">
       <Member Id="M:Xamarin.Essentials.MainThread.BeginInvokeOnMainThread(System.Action)" />
diff --git a/docs/en/Xamarin.Essentials/DeviceDisplay.xml b/docs/en/Xamarin.Essentials/DeviceDisplay.xml
index 4d99d7751..c06ec8d20 100644
--- a/docs/en/Xamarin.Essentials/DeviceDisplay.xml
+++ b/docs/en/Xamarin.Essentials/DeviceDisplay.xml
@@ -58,8 +58,8 @@
       </Docs>
     </Member>
     <Member MemberName="MainDisplayInfoChanged">
-      <MemberSignature Language="C#" Value="public static event EventHandler&lt;Xamarin.Essentials.MainDisplayInfoChangedEventArgs&gt; MainDisplayInfoChanged;" />
-      <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class Xamarin.Essentials.MainDisplayInfoChangedEventArgs&gt; MainDisplayInfoChanged" />
+      <MemberSignature Language="C#" Value="public static event EventHandler&lt;Xamarin.Essentials.DisplayInfoChangedEventArgs&gt; MainDisplayInfoChanged;" />
+      <MemberSignature Language="ILAsm" Value=".event class System.EventHandler`1&lt;class Xamarin.Essentials.DisplayInfoChangedEventArgs&gt; MainDisplayInfoChanged" />
       <MemberSignature Language="DocId" Value="E:Xamarin.Essentials.DeviceDisplay.MainDisplayInfoChanged" />
       <MemberType>Event</MemberType>
       <AssemblyInfo>
@@ -67,7 +67,7 @@
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
-        <ReturnType>System.EventHandler&lt;Xamarin.Essentials.MainDisplayInfoChangedEventArgs&gt;</ReturnType>
+        <ReturnType>System.EventHandler&lt;Xamarin.Essentials.DisplayInfoChangedEventArgs&gt;</ReturnType>
       </ReturnValue>
       <Docs>
         <summary>Event that is triggered when the main display info changes.</summary>
diff --git a/docs/en/Xamarin.Essentials/MainDisplayInfoChangedEventArgs.xml b/docs/en/Xamarin.Essentials/MainDisplayInfoChangedEventArgs.xml
index c6b9df9e9..ed06777b6 100644
--- a/docs/en/Xamarin.Essentials/MainDisplayInfoChangedEventArgs.xml
+++ b/docs/en/Xamarin.Essentials/MainDisplayInfoChangedEventArgs.xml
@@ -1,7 +1,7 @@
-<Type Name="MainDisplayInfoChangedEventArgs" FullName="Xamarin.Essentials.MainDisplayInfoChangedEventArgs">
-  <TypeSignature Language="C#" Value="public class MainDisplayInfoChangedEventArgs : EventArgs" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit MainDisplayInfoChangedEventArgs extends System.EventArgs" />
-  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.MainDisplayInfoChangedEventArgs" />
+<Type Name="DisplayInfoChangedEventArgs" FullName="Xamarin.Essentials.DisplayInfoChangedEventArgs">
+  <TypeSignature Language="C#" Value="public class DisplayInfoChangedEventArgs : EventArgs" />
+  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit DisplayInfoChangedEventArgs extends System.EventArgs" />
+  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.DisplayInfoChangedEventArgs" />
   <AssemblyInfo>
     <AssemblyName>Xamarin.Essentials</AssemblyName>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -18,9 +18,9 @@
   </Docs>
   <Members>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public MainDisplayInfoChangedEventArgs (Xamarin.Essentials.DisplayInfo mainDisplayInfo);" />
+      <MemberSignature Language="C#" Value="public DisplayInfoChangedEventArgs (Xamarin.Essentials.DisplayInfo mainDisplayInfo);" />
       <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(valuetype Xamarin.Essentials.DisplayInfo mainDisplayInfo) cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.MainDisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
       <MemberType>Constructor</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
@@ -38,7 +38,7 @@
     <Member MemberName="MainDisplayInfo">
       <MemberSignature Language="C#" Value="public Xamarin.Essentials.DisplayInfo MainDisplayInfo { get; }" />
       <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Essentials.DisplayInfo MainDisplayInfo" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.MainDisplayInfoChangedEventArgs.MainDisplayInfo" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.DisplayInfoChangedEventArgs.DisplayInfo" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
diff --git a/docs/en/index.xml b/docs/en/index.xml
index 9c729685f..683fd9dfe 100644
--- a/docs/en/index.xml
+++ b/docs/en/index.xml
@@ -139,7 +139,7 @@
       <Type Name="Magnetometer" Kind="Class" />
       <Type Name="MagnetometerChangedEventArgs" Kind="Class" />
       <Type Name="MagnetometerData" Kind="Structure" />
-      <Type Name="MainDisplayInfoChangedEventArgs" Kind="Class" />
+      <Type Name="DisplayInfoChangedEventArgs" Kind="Class" />
       <Type Name="MainThread" Kind="Class" />
       <Type Name="Map" Kind="Class" />
       <Type Name="MapLaunchOptions" Kind="Class" />

From fb8b85158d6ee8ecd4ab860147860ecc1aac5e43 Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Mon, 5 Nov 2018 12:17:10 -0800
Subject: [PATCH 30/43] Update Battery.android.cs

---
 Xamarin.Essentials/Battery/Battery.android.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Xamarin.Essentials/Battery/Battery.android.cs b/Xamarin.Essentials/Battery/Battery.android.cs
index a1fbe4245..e05ba9b26 100644
--- a/Xamarin.Essentials/Battery/Battery.android.cs
+++ b/Xamarin.Essentials/Battery/Battery.android.cs
@@ -52,7 +52,7 @@ static void StartBatteryListeners()
             Permissions.EnsureDeclared(PermissionType.Battery);
 
             batteryReceiver = new BatteryBroadcastReceiver(OnBatteryInfoChanged);
-            Platform.AppContext.RegisterReceiver(batteryReceiver, new IntentFilter(Intent.ActionBatteryInfoChanged));
+            Platform.AppContext.RegisterReceiver(batteryReceiver, new IntentFilter(Intent.ActionBatteryChanged));
         }
 
         static void StopBatteryListeners()

From fcb02287dc7ec7db1b610ec8bc001cda0a48f37d Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Mon, 5 Nov 2018 12:21:08 -0800
Subject: [PATCH 31/43] change to valid key

---
 DeviceTests/DeviceTests.Shared/SecureStorage_Tests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DeviceTests/DeviceTests.Shared/SecureStorage_Tests.cs b/DeviceTests/DeviceTests.Shared/SecureStorage_Tests.cs
index 5f616d27d..43e616684 100644
--- a/DeviceTests/DeviceTests.Shared/SecureStorage_Tests.cs
+++ b/DeviceTests/DeviceTests.Shared/SecureStorage_Tests.cs
@@ -56,7 +56,7 @@ public async Task Fix_Corrupt_Key(string key, string data)
 
             // simulate corrupt the key
             var prefKey = "SecureStorageKey";
-            var mainKey = "B2PfJSNdEDjM+422tpu7FqFcVQQbO3ti/DvnDnIqrq9CFwaBi6NdXYcicjvMW6nF7X/Clpto5xerM41U1H4qtWJDO0Ijc5QNTHGZl9tDSbXJ6yDCDDnEDryj2uTa8DiHoNcNX68QtcV3at4kkJKXXAwZXSC88a73/xDdh1u5gUdCeXJzVc5vOY6QpAGUH0bjR5NHrqEQNNGDdquFGN9n2ZJPsEK6C9fx0QwCIL+uldpAYSWrpmUIr+/0X7Y0mJpN84ldygEVxHLBuVrzB4Bbu5XGLUN/0Sr2plWcKm7XhM6wp3JRW6Eae2ozys42p1YLeM0HXWrhTqP6FRPkS6mOtw==";
+            var mainKey = "A2PfJSNdEDjM+422tpu7FqFcVQQbO3ti/DvnDnIqrq9CFwaBi6NdXYcicjvMW6nF7X/Clpto5xerM41U1H4qtWJDO0Ijc5QNTHGZl9tDSbXJ6yDCDDnEDryj2uTa8DiHoNcNX68QtcV3at4kkJKXXAwZXSC88a73/xDdh1u5gUdCeXJzVc5vOY6QpAGUH0bjR5NHrqEQNNGDdquFGN9n2ZJPsEK6C9fx0QwCIL+uldpAYSWrpmUIr+/0X7Y0mJpN84ldygEVxHLBuVrzB4Bbu5XGLUN/0Sr2plWcKm7XhM6wp3JRW6Eae2ozys42p1YLeM0HXWrhTqP6FRPkS6mOtw==";
 
             Preferences.Set(prefKey, mainKey, SecureStorage.Alias);
 

From 895ed8bbd050fc0c1be579f4f300f09cd7d1146d Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Mon, 5 Nov 2018 12:23:30 -0800
Subject: [PATCH 32/43] Update Battery.android.cs

---
 Xamarin.Essentials/Battery/Battery.android.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Xamarin.Essentials/Battery/Battery.android.cs b/Xamarin.Essentials/Battery/Battery.android.cs
index e05ba9b26..b0bc6f214 100644
--- a/Xamarin.Essentials/Battery/Battery.android.cs
+++ b/Xamarin.Essentials/Battery/Battery.android.cs
@@ -75,7 +75,7 @@ static double PlatformChargeLevel
             {
                 Permissions.EnsureDeclared(PermissionType.Battery);
 
-                using (var filter = new IntentFilter(Intent.ActionBatteryInfoChanged))
+                using (var filter = new IntentFilter(Intent.ActionBatteryChanged))
                 using (var battery = Platform.AppContext.RegisterReceiver(null, filter))
                 {
                     var level = battery.GetIntExtra(BatteryManager.ExtraLevel, -1);
@@ -95,7 +95,7 @@ static BatteryState PlatformState
             {
                 Permissions.EnsureDeclared(PermissionType.Battery);
 
-                using (var filter = new IntentFilter(Intent.ActionBatteryInfoChanged))
+                using (var filter = new IntentFilter(Intent.ActionBatteryChanged))
                 using (var battery = Platform.AppContext.RegisterReceiver(null, filter))
                 {
                     var status = battery.GetIntExtra(BatteryManager.ExtraStatus, -1);

From 3c917b572347d4d37cf5be1b7fd74ff4019e123a Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Mon, 5 Nov 2018 12:34:28 -0800
Subject: [PATCH 33/43] Add docs

---
 ...ryChangedEventArgs.xml => BatteryInfoChangedEventArgs.xml} | 0
 docs/en/Xamarin.Essentials/Compass.xml                        | 4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 rename docs/en/Xamarin.Essentials/{BatteryChangedEventArgs.xml => BatteryInfoChangedEventArgs.xml} (100%)

diff --git a/docs/en/Xamarin.Essentials/BatteryChangedEventArgs.xml b/docs/en/Xamarin.Essentials/BatteryInfoChangedEventArgs.xml
similarity index 100%
rename from docs/en/Xamarin.Essentials/BatteryChangedEventArgs.xml
rename to docs/en/Xamarin.Essentials/BatteryInfoChangedEventArgs.xml
diff --git a/docs/en/Xamarin.Essentials/Compass.xml b/docs/en/Xamarin.Essentials/Compass.xml
index bf56da15a..c48f793ed 100644
--- a/docs/en/Xamarin.Essentials/Compass.xml
+++ b/docs/en/Xamarin.Essentials/Compass.xml
@@ -12,7 +12,9 @@
   <Interfaces />
   <Docs>
     <summary>Monitor changes to the orientation of the user's device.</summary>
-    <remarks></remarks>
+    <remarks>
+      <para />
+    </remarks>
   </Docs>
   <Members>
     <Member MemberName="ApplyLowPassFilter">

From fa971478e324cf3d6c8c7d980f0f6266164cead6 Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Mon, 5 Nov 2018 12:36:39 -0800
Subject: [PATCH 34/43] Rename file correctly for docs!

---
 ...ayInfoChangedEventArgs.xml => DisplayInfoChangedEventArgs.xml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docs/en/Xamarin.Essentials/{MainDisplayInfoChangedEventArgs.xml => DisplayInfoChangedEventArgs.xml} (100%)

diff --git a/docs/en/Xamarin.Essentials/MainDisplayInfoChangedEventArgs.xml b/docs/en/Xamarin.Essentials/DisplayInfoChangedEventArgs.xml
similarity index 100%
rename from docs/en/Xamarin.Essentials/MainDisplayInfoChangedEventArgs.xml
rename to docs/en/Xamarin.Essentials/DisplayInfoChangedEventArgs.xml

From 8d1eaebd0e4c4bd9ae01a5564b53676fd7fcaba8 Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Mon, 5 Nov 2018 12:59:00 -0800
Subject: [PATCH 35/43] Cleanup docs

---
 .../FrameworksIndex/xamarin-essentials-android.xml |  8 ++++----
 docs/en/FrameworksIndex/xamarin-essentials-ios.xml |  8 ++++----
 docs/en/FrameworksIndex/xamarin-essentials-uwp.xml |  8 ++++----
 docs/en/FrameworksIndex/xamarin-essentials.xml     |  8 ++++----
 .../DisplayInfoChangedEventArgs.xml                | 14 +++++++-------
 docs/en/index.xml                                  |  2 +-
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/docs/en/FrameworksIndex/xamarin-essentials-android.xml b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
index 524e556f7..b1b779146 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-android.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
@@ -188,6 +188,10 @@
       <Member Id="P:Xamarin.Essentials.DisplayInfo.Rotation" />
       <Member Id="P:Xamarin.Essentials.DisplayInfo.Width" />
     </Type>
+    <Type Name="Xamarin.Essentials.DisplayInfoChangedEventArgs" Id="T:Xamarin.Essentials.DisplayInfoChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.DisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfoChangedEventArgs.DisplayInfo" />
+    </Type>
     <Type Name="Xamarin.Essentials.DisplayOrientation" Id="T:Xamarin.Essentials.DisplayOrientation">
       <Member Id="F:Xamarin.Essentials.DisplayOrientation.Landscape" />
       <Member Id="F:Xamarin.Essentials.DisplayOrientation.Portrait" />
@@ -352,10 +356,6 @@
       <Member Id="M:Xamarin.Essentials.MagnetometerData.ToString" />
       <Member Id="P:Xamarin.Essentials.MagnetometerData.MagneticField" />
     </Type>
-    <Type Name="Xamarin.Essentials.DisplayInfoChangedEventArgs" Id="T:Xamarin.Essentials.DisplayInfoChangedEventArgs">
-      <Member Id="M:Xamarin.Essentials.DisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
-      <Member Id="P:Xamarin.Essentials.DisplayInfoChangedEventArgs.DisplayInfo" />
-    </Type>
     <Type Name="Xamarin.Essentials.MainThread" Id="T:Xamarin.Essentials.MainThread">
       <Member Id="M:Xamarin.Essentials.MainThread.BeginInvokeOnMainThread(System.Action)" />
       <Member Id="P:Xamarin.Essentials.MainThread.IsMainThread" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
index 640ca12af..57d9ea21f 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
@@ -189,6 +189,10 @@
       <Member Id="P:Xamarin.Essentials.DisplayInfo.Rotation" />
       <Member Id="P:Xamarin.Essentials.DisplayInfo.Width" />
     </Type>
+    <Type Name="Xamarin.Essentials.DisplayInfoChangedEventArgs" Id="T:Xamarin.Essentials.DisplayInfoChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.DisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfoChangedEventArgs.DisplayInfo" />
+    </Type>
     <Type Name="Xamarin.Essentials.DisplayOrientation" Id="T:Xamarin.Essentials.DisplayOrientation">
       <Member Id="F:Xamarin.Essentials.DisplayOrientation.Landscape" />
       <Member Id="F:Xamarin.Essentials.DisplayOrientation.Portrait" />
@@ -353,10 +357,6 @@
       <Member Id="M:Xamarin.Essentials.MagnetometerData.ToString" />
       <Member Id="P:Xamarin.Essentials.MagnetometerData.MagneticField" />
     </Type>
-    <Type Name="Xamarin.Essentials.DisplayInfoChangedEventArgs" Id="T:Xamarin.Essentials.DisplayInfoChangedEventArgs">
-      <Member Id="M:Xamarin.Essentials.DisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
-      <Member Id="P:Xamarin.Essentials.DisplayInfoChangedEventArgs.DisplayInfo" />
-    </Type>
     <Type Name="Xamarin.Essentials.MainThread" Id="T:Xamarin.Essentials.MainThread">
       <Member Id="M:Xamarin.Essentials.MainThread.BeginInvokeOnMainThread(System.Action)" />
       <Member Id="P:Xamarin.Essentials.MainThread.IsMainThread" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
index 0da6fef04..e9dfb9b57 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
@@ -188,6 +188,10 @@
       <Member Id="P:Xamarin.Essentials.DisplayInfo.Rotation" />
       <Member Id="P:Xamarin.Essentials.DisplayInfo.Width" />
     </Type>
+    <Type Name="Xamarin.Essentials.DisplayInfoChangedEventArgs" Id="T:Xamarin.Essentials.DisplayInfoChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.DisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfoChangedEventArgs.DisplayInfo" />
+    </Type>
     <Type Name="Xamarin.Essentials.DisplayOrientation" Id="T:Xamarin.Essentials.DisplayOrientation">
       <Member Id="F:Xamarin.Essentials.DisplayOrientation.Landscape" />
       <Member Id="F:Xamarin.Essentials.DisplayOrientation.Portrait" />
@@ -352,10 +356,6 @@
       <Member Id="M:Xamarin.Essentials.MagnetometerData.ToString" />
       <Member Id="P:Xamarin.Essentials.MagnetometerData.MagneticField" />
     </Type>
-    <Type Name="Xamarin.Essentials.DisplayInfoChangedEventArgs" Id="T:Xamarin.Essentials.DisplayInfoChangedEventArgs">
-      <Member Id="M:Xamarin.Essentials.DisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
-      <Member Id="P:Xamarin.Essentials.DisplayInfoChangedEventArgs.DisplayInfo" />
-    </Type>
     <Type Name="Xamarin.Essentials.MainThread" Id="T:Xamarin.Essentials.MainThread">
       <Member Id="M:Xamarin.Essentials.MainThread.BeginInvokeOnMainThread(System.Action)" />
       <Member Id="P:Xamarin.Essentials.MainThread.IsMainThread" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials.xml b/docs/en/FrameworksIndex/xamarin-essentials.xml
index d8ba041ab..e32b78a0e 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials.xml
@@ -188,6 +188,10 @@
       <Member Id="P:Xamarin.Essentials.DisplayInfo.Rotation" />
       <Member Id="P:Xamarin.Essentials.DisplayInfo.Width" />
     </Type>
+    <Type Name="Xamarin.Essentials.DisplayInfoChangedEventArgs" Id="T:Xamarin.Essentials.DisplayInfoChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.DisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
+      <Member Id="P:Xamarin.Essentials.DisplayInfoChangedEventArgs.DisplayInfo" />
+    </Type>
     <Type Name="Xamarin.Essentials.DisplayOrientation" Id="T:Xamarin.Essentials.DisplayOrientation">
       <Member Id="F:Xamarin.Essentials.DisplayOrientation.Landscape" />
       <Member Id="F:Xamarin.Essentials.DisplayOrientation.Portrait" />
@@ -352,10 +356,6 @@
       <Member Id="M:Xamarin.Essentials.MagnetometerData.ToString" />
       <Member Id="P:Xamarin.Essentials.MagnetometerData.MagneticField" />
     </Type>
-    <Type Name="Xamarin.Essentials.DisplayInfoChangedEventArgs" Id="T:Xamarin.Essentials.DisplayInfoChangedEventArgs">
-      <Member Id="M:Xamarin.Essentials.DisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
-      <Member Id="P:Xamarin.Essentials.DisplayInfoChangedEventArgs.DisplayInfo" />
-    </Type>
     <Type Name="Xamarin.Essentials.MainThread" Id="T:Xamarin.Essentials.MainThread">
       <Member Id="M:Xamarin.Essentials.MainThread.BeginInvokeOnMainThread(System.Action)" />
       <Member Id="P:Xamarin.Essentials.MainThread.IsMainThread" />
diff --git a/docs/en/Xamarin.Essentials/DisplayInfoChangedEventArgs.xml b/docs/en/Xamarin.Essentials/DisplayInfoChangedEventArgs.xml
index ed06777b6..8f382b7f1 100644
--- a/docs/en/Xamarin.Essentials/DisplayInfoChangedEventArgs.xml
+++ b/docs/en/Xamarin.Essentials/DisplayInfoChangedEventArgs.xml
@@ -18,8 +18,8 @@
   </Docs>
   <Members>
     <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public DisplayInfoChangedEventArgs (Xamarin.Essentials.DisplayInfo mainDisplayInfo);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(valuetype Xamarin.Essentials.DisplayInfo mainDisplayInfo) cil managed" />
+      <MemberSignature Language="C#" Value="public DisplayInfoChangedEventArgs (Xamarin.Essentials.DisplayInfo displayInfo);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(valuetype Xamarin.Essentials.DisplayInfo displayInfo) cil managed" />
       <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.DisplayInfoChangedEventArgs.#ctor(Xamarin.Essentials.DisplayInfo)" />
       <MemberType>Constructor</MemberType>
       <AssemblyInfo>
@@ -27,17 +27,17 @@
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <Parameters>
-        <Parameter Name="mainDisplayInfo" Type="Xamarin.Essentials.DisplayInfo" Index="0" FrameworkAlternate="xamarin-essentials;xamarin-essentials-android;xamarin-essentials-ios;xamarin-essentials-uwp" />
+        <Parameter Name="displayInfo" Type="Xamarin.Essentials.DisplayInfo" Index="0" FrameworkAlternate="xamarin-essentials;xamarin-essentials-android;xamarin-essentials-ios;xamarin-essentials-uwp" />
       </Parameters>
       <Docs>
-        <param name="mainDisplayInfo">To be added.</param>
+        <param name="displayInfo">To be added.</param>
         <summary>Main constructor for event args.</summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
-    <Member MemberName="MainDisplayInfo">
-      <MemberSignature Language="C#" Value="public Xamarin.Essentials.DisplayInfo MainDisplayInfo { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Essentials.DisplayInfo MainDisplayInfo" />
+    <Member MemberName="DisplayInfo">
+      <MemberSignature Language="C#" Value="public Xamarin.Essentials.DisplayInfo DisplayInfo { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Essentials.DisplayInfo DisplayInfo" />
       <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.DisplayInfoChangedEventArgs.DisplayInfo" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
diff --git a/docs/en/index.xml b/docs/en/index.xml
index 683fd9dfe..e8ad4f429 100644
--- a/docs/en/index.xml
+++ b/docs/en/index.xml
@@ -113,6 +113,7 @@
       <Type Name="DevicePlatform" Kind="Structure" />
       <Type Name="DeviceType" Kind="Enumeration" />
       <Type Name="DisplayInfo" Kind="Structure" />
+      <Type Name="DisplayInfoChangedEventArgs" Kind="Class" />
       <Type Name="DisplayOrientation" Kind="Enumeration" />
       <Type Name="DisplayRotation" Kind="Enumeration" />
       <Type Name="DistanceUnits" Kind="Enumeration" />
@@ -139,7 +140,6 @@
       <Type Name="Magnetometer" Kind="Class" />
       <Type Name="MagnetometerChangedEventArgs" Kind="Class" />
       <Type Name="MagnetometerData" Kind="Structure" />
-      <Type Name="DisplayInfoChangedEventArgs" Kind="Class" />
       <Type Name="MainThread" Kind="Class" />
       <Type Name="Map" Kind="Class" />
       <Type Name="MapLaunchOptions" Kind="Class" />

From b2ab4b7e4c0588843861632f6b425ee40327dcd7 Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Mon, 5 Nov 2018 13:50:50 -0800
Subject: [PATCH 36/43] Catch only specific exceptions. some code cleanup

---
 .../SecureStorage/SecureStorage.android.cs    | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/Xamarin.Essentials/SecureStorage/SecureStorage.android.cs b/Xamarin.Essentials/SecureStorage/SecureStorage.android.cs
index 212494181..84992bd66 100644
--- a/Xamarin.Essentials/SecureStorage/SecureStorage.android.cs
+++ b/Xamarin.Essentials/SecureStorage/SecureStorage.android.cs
@@ -88,13 +88,13 @@ internal AndroidKeyStore(Context context, string keystoreAlias, bool alwaysUseAs
             keyStore.Load(null);
         }
 
-        Context appContext;
-        string alias;
-        KeyStore keyStore;
-        bool alwaysUseAsymmetricKey;
+        readonly Context appContext;
+        readonly string alias;
+        readonly bool alwaysUseAsymmetricKey;
+        readonly string useSymmetricPreferenceKey = "essentials_use_symmetric";
 
+        KeyStore keyStore;
         bool useSymmetric = false;
-        string useSymmetricPreferenceKey = "essentials_use_symmetric";
 
         ISecretKey GetKey()
         {
@@ -131,11 +131,15 @@ ISecretKey GetKey()
 
                     return kp;
                 }
-                catch (Exception ex)
+                catch (IllegalBlockSizeException ibsEx)
                 {
-                    System.Diagnostics.Debug.WriteLine($"Unable to unwrap key. This may be caused by system backup or upgrades. All secure storage items will now be removed. {ex.Message}");
-                    SecureStorage.RemoveAll();
+                    System.Diagnostics.Debug.WriteLine($"Unable to unwrap key: Illegal Block Size. This may be caused by system backup or upgrades. All secure storage items will now be removed. {ibsEx.Message}");
                 }
+                catch (BadPaddingException paddingEx)
+                {
+                    System.Diagnostics.Debug.WriteLine($"Unable to unwrap key: Bad Padding. This may be caused by system backup or upgrades. All secure storage items will now be removed. {paddingEx.Message}");
+                }
+                SecureStorage.RemoveAll();
             }
 
             var keyGenerator = KeyGenerator.GetInstance(aesAlgorithm);
@@ -242,6 +246,7 @@ internal byte[] Encrypt(string data)
 
             // Generate initialization vector
             var iv = new byte[initializationVectorLen];
+
             var sr = new SecureRandom();
             sr.NextBytes(iv);
 
@@ -253,7 +258,7 @@ internal byte[] Encrypt(string data)
                 cipher = Cipher.GetInstance(cipherTransformationSymmetric);
                 cipher.Init(CipherMode.EncryptMode, key, new GCMParameterSpec(128, iv));
             }
-            catch (Java.Security.InvalidAlgorithmParameterException)
+            catch (InvalidAlgorithmParameterException)
             {
                 // If we encounter this error, it's likely an old bouncycastle provider version
                 // is being used which does not recognize GCMParameterSpec, but should work
@@ -294,7 +299,7 @@ internal string Decrypt(byte[] data)
                 cipher = Cipher.GetInstance(cipherTransformationSymmetric);
                 cipher.Init(CipherMode.DecryptMode, key, new GCMParameterSpec(128, iv));
             }
-            catch (Java.Security.InvalidAlgorithmParameterException)
+            catch (InvalidAlgorithmParameterException)
             {
                 // If we encounter this error, it's likely an old bouncycastle provider version
                 // is being used which does not recognize GCMParameterSpec, but should work

From f935973c40cde0fb6383ab68bb4598e700aa0cf7 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 6 Nov 2018 00:13:46 +0200
Subject: [PATCH 37/43] Updated the sensors to adhere to guidelines. #582  -
 enum names  - compas low pass filter is now a param  - updated docs  - public
 constructors on data and events  - stating an already started sensor will
 throw  - sensor use the same units on all platforms Added a unit conversion
 API. #575

---
 .../DeviceTests.Shared/Barometer_Shared.cs    |   2 +-
 Samples/Samples/View/AllSensorsPage.xaml      |   2 +-
 Samples/Samples/View/CompassPage.xaml         |   6 +-
 .../ViewModel/AccelerometerViewModel.cs       |  12 +-
 .../Samples/ViewModel/BarometerViewModel.cs   |  14 +-
 Samples/Samples/ViewModel/CompassViewModel.cs |  27 +-
 .../Samples/ViewModel/GyroscopeViewModel.cs   |  12 +-
 .../ViewModel/MagnetometerViewModel.cs        |  12 +-
 .../ViewModel/OrientationSensorViewModel.cs   |  12 +-
 Tests/Accelerometer_Tests.cs                  |   2 +-
 Tests/Barometer_Tests.cs                      |   2 +-
 Tests/Compass_Tests.cs                        |   2 +-
 Tests/Gyroscope_Tests.cs                      |   2 +-
 Tests/Magnetometer_Tests.cs                   |   2 +-
 Tests/OrientationSensor_Tests.cs              |   2 +-
 Tests/UnitConverters_Tests.cs                 | 138 +++++
 .../Accelerometer/Accelerometer.shared.cs     |  10 +-
 Xamarin.Essentials/Barometer/Barometer.ios.cs |   3 +-
 .../Barometer/Barometer.shared.cs             |  18 +-
 Xamarin.Essentials/Battery/Battery.shared.cs  |   4 +-
 Xamarin.Essentials/Compass/Compass.android.cs |  12 +-
 Xamarin.Essentials/Compass/Compass.ios.cs     |   4 +-
 .../Compass/Compass.netstandard.cs            |   2 +-
 Xamarin.Essentials/Compass/Compass.shared.cs  |  14 +-
 Xamarin.Essentials/Compass/Compass.uwp.cs     |   2 +-
 .../Connectivity/Connectivity.shared.cs       |   2 +-
 .../Gyroscope/Gyroscope.shared.cs             |  10 +-
 .../Magnetometer/Magnetometer.shared.cs       |  10 +-
 .../OrientationSensor.shared.cs               |  10 +-
 Xamarin.Essentials/Types/Location.shared.cs   |  40 +-
 .../Types/SensorSpeed.shared.cs               |   8 +-
 .../Types/UnitConverters.shared.cs            | 104 ++++
 .../xamarin-essentials-android.xml            |  52 +-
 .../xamarin-essentials-ios.xml                |  52 +-
 .../xamarin-essentials-uwp.xml                |  52 +-
 .../en/FrameworksIndex/xamarin-essentials.xml |  52 +-
 .../AccelerometerChangedEventArgs.xml         |  18 +
 .../Xamarin.Essentials/AccelerometerData.xml  |  44 ++
 .../BarometerChangedEventArgs.xml             |  18 +
 docs/en/Xamarin.Essentials/BarometerData.xml  |  32 +-
 .../BatteryChangedEventArgs.xml               |  22 +
 docs/en/Xamarin.Essentials/Compass.xml        |  41 +-
 .../CompassChangedEventArgs.xml               |  18 +
 docs/en/Xamarin.Essentials/CompassData.xml    |  18 +
 .../ConnectivityChangedEventArgs.xml          |  20 +
 .../EnergySaverStatusChangedEventArgs.xml     |  18 +
 .../GyroscopeChangedEventArgs.xml             |  18 +
 docs/en/Xamarin.Essentials/GyroscopeData.xml  |  46 +-
 docs/en/Xamarin.Essentials/Location.xml       |  50 +-
 docs/en/Xamarin.Essentials/Magnetometer.xml   |   2 +-
 .../MagnetometerChangedEventArgs.xml          |  18 +
 .../Xamarin.Essentials/MagnetometerData.xml   |  46 +-
 .../OrientationSensorChangedEventArgs.xml     |  18 +
 .../OrientationSensorData.xml                 |  48 ++
 docs/en/Xamarin.Essentials/SensorSpeed.xml    |  40 +-
 docs/en/Xamarin.Essentials/UnitConverters.xml | 537 ++++++++++++++++++
 docs/en/index.xml                             |   3 +-
 57 files changed, 1513 insertions(+), 272 deletions(-)
 create mode 100644 Tests/UnitConverters_Tests.cs
 create mode 100644 Xamarin.Essentials/Types/UnitConverters.shared.cs
 create mode 100644 docs/en/Xamarin.Essentials/UnitConverters.xml

diff --git a/DeviceTests/DeviceTests.Shared/Barometer_Shared.cs b/DeviceTests/DeviceTests.Shared/Barometer_Shared.cs
index 7567944dc..9095a430a 100644
--- a/DeviceTests/DeviceTests.Shared/Barometer_Shared.cs
+++ b/DeviceTests/DeviceTests.Shared/Barometer_Shared.cs
@@ -29,7 +29,7 @@ void Barometer_ReadingChanged(object sender, BarometerChangedEventArgs e)
 
             var d = await tcs.Task;
 
-            Assert.True(d.Pressure >= 0);
+            Assert.True(d.PressureInHectopascals >= 0);
             Barometer.Stop();
             Barometer.ReadingChanged -= Barometer_ReadingChanged;
         }
diff --git a/Samples/Samples/View/AllSensorsPage.xaml b/Samples/Samples/View/AllSensorsPage.xaml
index 932a63741..d3494eb06 100644
--- a/Samples/Samples/View/AllSensorsPage.xaml
+++ b/Samples/Samples/View/AllSensorsPage.xaml
@@ -63,7 +63,7 @@
                     <Label Grid.Row="0" Grid.ColumnSpan="2" Text="{Binding Compass1, StringFormat='Compass 1 Degrees: {0:N}'}" />
 
                     <Picker Grid.Row="1" Grid.ColumnSpan="2" HorizontalOptions="FillAndExpand"
-                            ItemsSource="{Binding CompassSpeeds}"
+                            ItemsSource="{Binding Speeds}"
                             SelectedIndex="{Binding Speed1, Mode=TwoWay}"
                             IsEnabled="{Binding Compass1IsActive, Converter={StaticResource NegativeConverter}}" />
 
diff --git a/Samples/Samples/View/CompassPage.xaml b/Samples/Samples/View/CompassPage.xaml
index 32194a575..f6cb83a8c 100644
--- a/Samples/Samples/View/CompassPage.xaml
+++ b/Samples/Samples/View/CompassPage.xaml
@@ -11,7 +11,7 @@
     <StackLayout>
         <Label Text="Monitor compass for changes." FontAttributes="Bold" Margin="12" />
 
-        <Switch IsToggled="{Binding CompassApplyLowPassFilter}" >
+        <Switch IsToggled="{Binding ApplyLowPassFilter}" >
             <Switch.IsVisible>
                 <OnPlatform x:TypeArguments="x:Boolean" Android="True" Default="False"/>
             </Switch.IsVisible>
@@ -36,7 +36,7 @@
                        Text="{Binding Compass1, StringFormat='Compass 1 Degrees: {0:N}'}" />
 
                 <Picker Grid.Row="1" Grid.ColumnSpan="2" HorizontalOptions="FillAndExpand"
-                        ItemsSource="{Binding CompassSpeeds}" 
+                        ItemsSource="{Binding Speeds}"
                         SelectedIndex="{Binding Speed1, Mode=TwoWay}"
                         IsEnabled="{Binding Compass1IsActive, Converter={StaticResource NegativeConverter}}" />
 
@@ -51,7 +51,7 @@
 
                 <Picker Grid.Row="4" Grid.ColumnSpan="2" 
                         HorizontalOptions="FillAndExpand"
-                        ItemsSource="{Binding CompassSpeeds}" 
+                        ItemsSource="{Binding Speeds}"
                         SelectedIndex="{Binding Speed2, Mode=TwoWay}"
                         IsEnabled="{Binding Compass2IsActive, Converter={StaticResource NegativeConverter}}" />
 
diff --git a/Samples/Samples/ViewModel/AccelerometerViewModel.cs b/Samples/Samples/ViewModel/AccelerometerViewModel.cs
index 3d1d21a8d..56924bcdc 100644
--- a/Samples/Samples/ViewModel/AccelerometerViewModel.cs
+++ b/Samples/Samples/ViewModel/AccelerometerViewModel.cs
@@ -12,7 +12,7 @@ public class AccelerometerViewModel : BaseViewModel
         double y;
         double z;
         bool isActive;
-        int speed = 2;
+        int speed = 0;
 
         public AccelerometerViewModel()
         {
@@ -48,14 +48,8 @@ public bool IsActive
             set => SetProperty(ref isActive, value);
         }
 
-        public List<string> Speeds { get; } =
-           new List<string>
-           {
-                "Fastest",
-                "Game",
-                "Normal",
-                "User Interface"
-           };
+        public string[] Speeds { get; } =
+           Enum.GetNames(typeof(SensorSpeed));
 
         public int Speed
         {
diff --git a/Samples/Samples/ViewModel/BarometerViewModel.cs b/Samples/Samples/ViewModel/BarometerViewModel.cs
index f1011364f..0a13c036e 100644
--- a/Samples/Samples/ViewModel/BarometerViewModel.cs
+++ b/Samples/Samples/ViewModel/BarometerViewModel.cs
@@ -10,7 +10,7 @@ public class BarometerViewModel : BaseViewModel
     {
         bool isActive;
         double pressure;
-        int speed = 2;
+        int speed = 0;
 
         public BarometerViewModel()
         {
@@ -34,14 +34,8 @@ public double Pressure
             set => SetProperty(ref pressure, value);
         }
 
-        public List<string> Speeds { get; } =
-           new List<string>
-           {
-                        "Fastest",
-                        "Game",
-                        "Normal",
-                        "User Interface"
-           };
+        public string[] Speeds { get; } =
+           Enum.GetNames(typeof(SensorSpeed));
 
         public int Speed
         {
@@ -78,7 +72,7 @@ async void OnStartBarometer()
 
         void OnBarometerReadingChanged(object sender, BarometerChangedEventArgs e)
         {
-            Pressure = e.Reading.Pressure;
+            Pressure = e.Reading.PressureInHectopascals;
         }
 
         void OnStop()
diff --git a/Samples/Samples/ViewModel/CompassViewModel.cs b/Samples/Samples/ViewModel/CompassViewModel.cs
index e8314569c..1fe116cef 100644
--- a/Samples/Samples/ViewModel/CompassViewModel.cs
+++ b/Samples/Samples/ViewModel/CompassViewModel.cs
@@ -10,11 +10,11 @@ class CompassViewModel : BaseViewModel
     {
         bool compass1IsActive;
         bool compass2IsActive;
-        bool compassApplyLowPassFilter;
+        bool applyLowPassFilter;
         double compass1;
         double compass2;
-        int speed1 = 2;
-        int speed2 = 2;
+        int speed1 = 0;
+        int speed2 = 0;
 
         public CompassViewModel()
         {
@@ -44,13 +44,12 @@ public bool Compass2IsActive
             set => SetProperty(ref compass2IsActive, value);
         }
 
-        public bool CompassApplyLowPassFilter
+        public bool ApplyLowPassFilter
         {
-            get => compassApplyLowPassFilter;
+            get => applyLowPassFilter;
             set
             {
-                SetProperty(ref compassApplyLowPassFilter, value);
-                Compass.ApplyLowPassFilter = value;
+                SetProperty(ref applyLowPassFilter, value);
             }
         }
 
@@ -78,14 +77,8 @@ public int Speed2
             set => SetProperty(ref speed2, value);
         }
 
-        public List<string> CompassSpeeds { get; } =
-            new List<string>
-            {
-                "Fastest",
-                "Game",
-                "Normal",
-                "User Interface"
-            };
+        public string[] Speeds { get; } =
+           Enum.GetNames(typeof(SensorSpeed));
 
         public override void OnDisappearing()
         {
@@ -102,7 +95,7 @@ async void OnStartCompass1()
                 if (Compass.IsMonitoring)
                     OnStopCompass2();
 
-                Compass.Start((SensorSpeed)Speed1);
+                Compass.Start((SensorSpeed)Speed1, ApplyLowPassFilter);
                 Compass.ReadingChanged += OnCompass1ReadingChanged;
                 Compass1IsActive = true;
             }
@@ -140,7 +133,7 @@ async void OnStartCompass2()
                 if (Compass.IsMonitoring)
                     OnStopCompass1();
 
-                Compass.Start((SensorSpeed)Speed2);
+                Compass.Start((SensorSpeed)Speed2, ApplyLowPassFilter);
                 Compass.ReadingChanged += OnCompass2ReadingChanged;
                 Compass2IsActive = true;
             }
diff --git a/Samples/Samples/ViewModel/GyroscopeViewModel.cs b/Samples/Samples/ViewModel/GyroscopeViewModel.cs
index 1b685b584..49cc33014 100644
--- a/Samples/Samples/ViewModel/GyroscopeViewModel.cs
+++ b/Samples/Samples/ViewModel/GyroscopeViewModel.cs
@@ -12,7 +12,7 @@ public class GyroscopeViewModel : BaseViewModel
         double y;
         double z;
         bool isActive;
-        int speed = 2;
+        int speed = 0;
 
         public GyroscopeViewModel()
         {
@@ -48,14 +48,8 @@ public bool IsActive
             set => SetProperty(ref isActive, value);
         }
 
-        public List<string> Speeds { get; } =
-           new List<string>
-           {
-                "Fastest",
-                "Game",
-                "Normal",
-                "User Interface"
-           };
+        public string[] Speeds { get; } =
+           Enum.GetNames(typeof(SensorSpeed));
 
         public int Speed
         {
diff --git a/Samples/Samples/ViewModel/MagnetometerViewModel.cs b/Samples/Samples/ViewModel/MagnetometerViewModel.cs
index 4b563ce34..198269c6e 100644
--- a/Samples/Samples/ViewModel/MagnetometerViewModel.cs
+++ b/Samples/Samples/ViewModel/MagnetometerViewModel.cs
@@ -12,7 +12,7 @@ public class MagnetometerViewModel : BaseViewModel
         double y;
         double z;
         bool isActive;
-        int speed = 2;
+        int speed = 0;
 
         public MagnetometerViewModel()
         {
@@ -48,14 +48,8 @@ public bool IsActive
             set => SetProperty(ref isActive, value);
         }
 
-        public List<string> Speeds { get; } =
-           new List<string>
-           {
-                "Fastest",
-                "Game",
-                "Normal",
-                "User Interface"
-           };
+        public string[] Speeds { get; } =
+           Enum.GetNames(typeof(SensorSpeed));
 
         public int Speed
         {
diff --git a/Samples/Samples/ViewModel/OrientationSensorViewModel.cs b/Samples/Samples/ViewModel/OrientationSensorViewModel.cs
index 485e1d612..e6758613e 100644
--- a/Samples/Samples/ViewModel/OrientationSensorViewModel.cs
+++ b/Samples/Samples/ViewModel/OrientationSensorViewModel.cs
@@ -13,7 +13,7 @@ class OrientationSensorViewModel : BaseViewModel
         double z;
         double w;
         bool isActive;
-        int speed = 2;
+        int speed = 0;
 
         public OrientationSensorViewModel()
         {
@@ -55,14 +55,8 @@ public bool IsActive
             set => SetProperty(ref isActive, value);
         }
 
-        public List<string> Speeds { get; } =
-           new List<string>
-           {
-                "Fastest",
-                "Game",
-                "Normal",
-                "User Interface"
-           };
+        public string[] Speeds { get; } =
+           Enum.GetNames(typeof(SensorSpeed));
 
         public int Speed
         {
diff --git a/Tests/Accelerometer_Tests.cs b/Tests/Accelerometer_Tests.cs
index de8d6a893..5696f5157 100644
--- a/Tests/Accelerometer_Tests.cs
+++ b/Tests/Accelerometer_Tests.cs
@@ -11,7 +11,7 @@ public void Accelerometer_Start() =>
 
         [Fact]
         public void Accelerometer_Stop() =>
-            Assert.Throws<NotImplementedInReferenceAssemblyException>(() => Accelerometer.Start(SensorSpeed.Normal));
+            Assert.Throws<NotImplementedInReferenceAssemblyException>(() => Accelerometer.Start(SensorSpeed.Default));
 
         [Fact]
         public void Accelerometer_IsMonitoring() =>
diff --git a/Tests/Barometer_Tests.cs b/Tests/Barometer_Tests.cs
index d6e0ca4dd..6d550d94c 100644
--- a/Tests/Barometer_Tests.cs
+++ b/Tests/Barometer_Tests.cs
@@ -12,7 +12,7 @@ public void Barometer_Start() =>
 
         [Fact]
         public void Barometer_Stop() =>
-            Assert.Throws<NotImplementedInReferenceAssemblyException>(() => Barometer.Start(SensorSpeed.Normal));
+            Assert.Throws<NotImplementedInReferenceAssemblyException>(() => Barometer.Start(SensorSpeed.Default));
 
         [Fact]
         public void Barometer_IsMonitoring() =>
diff --git a/Tests/Compass_Tests.cs b/Tests/Compass_Tests.cs
index 2b29772b8..16fbb9d0f 100644
--- a/Tests/Compass_Tests.cs
+++ b/Tests/Compass_Tests.cs
@@ -12,7 +12,7 @@ public void Compass_Start() =>
 
         [Fact]
         public void Compass_Stop() =>
-            Assert.Throws<NotImplementedInReferenceAssemblyException>(() => Compass.Start(SensorSpeed.Normal));
+            Assert.Throws<NotImplementedInReferenceAssemblyException>(() => Compass.Start(SensorSpeed.Default));
 
         [Fact]
         public void Compass_IsMonitoring() =>
diff --git a/Tests/Gyroscope_Tests.cs b/Tests/Gyroscope_Tests.cs
index 52079cf6b..6ed1025d2 100644
--- a/Tests/Gyroscope_Tests.cs
+++ b/Tests/Gyroscope_Tests.cs
@@ -11,7 +11,7 @@ public void Gyroscope_Start() =>
 
         [Fact]
         public void Gyroscope_Stop() =>
-            Assert.Throws<NotImplementedInReferenceAssemblyException>(() => Gyroscope.Start(SensorSpeed.Normal));
+            Assert.Throws<NotImplementedInReferenceAssemblyException>(() => Gyroscope.Start(SensorSpeed.Default));
 
         [Fact]
         public void Gyroscope_IsMonitoring() =>
diff --git a/Tests/Magnetometer_Tests.cs b/Tests/Magnetometer_Tests.cs
index 59e788022..6c90f9b9b 100644
--- a/Tests/Magnetometer_Tests.cs
+++ b/Tests/Magnetometer_Tests.cs
@@ -11,7 +11,7 @@ public void Magnetometer_Start() =>
 
         [Fact]
         public void Magnetometer_Stop() =>
-            Assert.Throws<NotImplementedInReferenceAssemblyException>(() => Magnetometer.Start(SensorSpeed.Normal));
+            Assert.Throws<NotImplementedInReferenceAssemblyException>(() => Magnetometer.Start(SensorSpeed.Default));
 
         [Fact]
         public void Magnetometer_IsMonitoring() =>
diff --git a/Tests/OrientationSensor_Tests.cs b/Tests/OrientationSensor_Tests.cs
index 64262309c..22fb3f0e5 100644
--- a/Tests/OrientationSensor_Tests.cs
+++ b/Tests/OrientationSensor_Tests.cs
@@ -11,7 +11,7 @@ public void OrientationSensor_Start() =>
 
         [Fact]
         public void OrientationSensor_Stop() =>
-            Assert.Throws<NotImplementedInReferenceAssemblyException>(() => OrientationSensor.Start(SensorSpeed.Normal));
+            Assert.Throws<NotImplementedInReferenceAssemblyException>(() => OrientationSensor.Start(SensorSpeed.Default));
 
         [Fact]
         public void OrientationSensor_IsMonitoring() =>
diff --git a/Tests/UnitConverters_Tests.cs b/Tests/UnitConverters_Tests.cs
new file mode 100644
index 000000000..f4a1a6ed8
--- /dev/null
+++ b/Tests/UnitConverters_Tests.cs
@@ -0,0 +1,138 @@
+using Xamarin.Essentials;
+using Xunit;
+
+namespace Tests
+{
+    public class UnitConverters_Tests
+    {
+        [Theory]
+        [InlineData(-1, -0.0175)]
+        [InlineData(0.1, 0.0017)]
+        [InlineData(0.5, 0.0087)]
+        [InlineData(1, 0.0175)]
+        [InlineData(2, 0.0349)]
+        [InlineData(3, 0.0524)]
+        [InlineData(10, 0.1745)]
+        [InlineData(57.2958, 1)]
+        [InlineData(114.5916, 2)]
+        [InlineData(171.8873, 3)]
+        [InlineData(572.9578, 10)]
+        [InlineData(1000, 17.4533)]
+        [InlineData(57295.7795, 1000)]
+        [InlineData(0, 0)]
+        public void DegreesPerSecondToRadiansPerSecond(double degrees, double radians)
+        {
+            Assert.Equal(radians, UnitConverters.DegreesPerSecondToRadiansPerSecond(degrees), 4);
+        }
+
+        [Theory]
+        [InlineData(-1, -57.2958)]
+        [InlineData(0.0017, 0.0974)]
+        [InlineData(0.0087, 0.4985)]
+        [InlineData(0.0175, 1.0027)]
+        [InlineData(0.0349, 1.9996)]
+        [InlineData(0.0524, 3.0023)]
+        [InlineData(0.1745, 9.9981)]
+        [InlineData(1, 57.2958)]
+        [InlineData(2, 114.5916)]
+        [InlineData(3, 171.8873)]
+        [InlineData(10, 572.9578)]
+        [InlineData(17.4533, 1000.0004)]
+        [InlineData(1000, 57295.7795)]
+        [InlineData(0, 0)]
+        public void RadiansPerSecondToDegreesPerSecond(double radians, double degrees)
+        {
+            Assert.Equal(degrees, UnitConverters.RadiansPerSecondToDegreesPerSecond(radians), 4);
+        }
+
+        [Theory]
+        [InlineData(-1, -10)]
+        [InlineData(0.1, 1)]
+        [InlineData(1, 10)]
+        [InlineData(10, 100)]
+        [InlineData(0, 0)]
+        public void KilopascalsToHectopascals(double kpa, double hpa)
+        {
+            Assert.Equal(hpa, UnitConverters.KilopascalsToHectopascals(kpa), 4);
+        }
+
+        [Theory]
+        [InlineData(-10, -1)]
+        [InlineData(1, 0.1)]
+        [InlineData(10, 1)]
+        [InlineData(100, 10)]
+        [InlineData(0, 0)]
+        public void HectopascalsKilopascals(double hpa, double kpa)
+        {
+            Assert.Equal(kpa, UnitConverters.HectopascalsToKilopascals(hpa), 4);
+        }
+
+        [Theory]
+        [InlineData(-1, -0.0175)]
+        [InlineData(0.1, 0.0017)]
+        [InlineData(1, 0.0175)]
+        [InlineData(10, 0.1745)]
+        [InlineData(180, 3.1416)]
+        [InlineData(360, 6.2832)]
+        [InlineData(10313.2403, 180)]
+        [InlineData(0, 0)]
+        public void DegreesToRadians(double deg, double rad)
+        {
+            Assert.Equal(rad, UnitConverters.DegreesToRadians(deg), 4);
+        }
+
+        [Theory]
+        [InlineData(-1, -57.2958)]
+        [InlineData(0.1, 5.7296)]
+        [InlineData(1, 57.2958)]
+        [InlineData(3.1416, 180.0004)]
+        [InlineData(6.2832, 360.0008)]
+        [InlineData(10, 572.9578)]
+        [InlineData(180, 10313.2403)]
+        [InlineData(360, 20626.4806)]
+        [InlineData(0, 0)]
+        public void RadiansToDegrees(double rad, double deg)
+        {
+            Assert.Equal(deg, UnitConverters.RadiansToDegrees(rad), 4);
+        }
+
+        [Theory]
+        [InlineData(-1, -1.6093)]
+        [InlineData(0.1, 0.1609)]
+        [InlineData(1, 1.6093)]
+        [InlineData(2, 3.2187)]
+        [InlineData(3, 4.828)]
+        [InlineData(10, 16.0934)]
+        [InlineData(0, 0)]
+        public void MilesToKilometers(double miles, double km)
+        {
+            Assert.Equal(km, UnitConverters.MilesToKilometers(miles), 4);
+        }
+
+        [Theory]
+        [InlineData(-1, -0.6214)]
+        [InlineData(0.1, 0.0621)]
+        [InlineData(1, 0.6214)]
+        [InlineData(2, 1.2427)]
+        [InlineData(3, 1.8641)]
+        [InlineData(10, 6.2137)]
+        [InlineData(0, 0)]
+        public void KilometersToMiles(double km, double miles)
+        {
+            Assert.Equal(miles, UnitConverters.KilometersToMiles(km), 4);
+        }
+
+        [Theory]
+        [InlineData(55.85781, -4.24253, 51.509865, -0.118092, 554.3128)] // glasgow -> london
+        [InlineData(36.12, -86.67, 33.94, -118.40, 2886.4444)] // nashville, tn -> los angeles, ca
+        [InlineData(51.509865, -0.118092, -33.92528, 18.42389, 9671.1251)] // london -> cape town
+        [InlineData(51.509865, -0.118092, 40.42028, -3.70577, 1263.4938)] // london -> madrid
+        [InlineData(42.93708, -75.6107, -33.92528, 18.42389, 12789.5628)] // new york -> cape town
+        [InlineData(45.80721, 15.96757, 19.432608, -99.133209, 10264.4796)] // zagreb -> mexico city
+        [InlineData(43.623409, -79.368683, 42.35866, -71.05674, 690.2032)] // toronto -> boston, ma
+        public void CoordinatesToKilometers(double lat1, double lon1, double lat2, double lon2, double distance)
+        {
+            Assert.Equal(distance, UnitConverters.CoordinatesToKilometers(lat1, lon1, lat2, lon2), 4);
+        }
+    }
+}
diff --git a/Xamarin.Essentials/Accelerometer/Accelerometer.shared.cs b/Xamarin.Essentials/Accelerometer/Accelerometer.shared.cs
index 74749f49a..05cb655a4 100644
--- a/Xamarin.Essentials/Accelerometer/Accelerometer.shared.cs
+++ b/Xamarin.Essentials/Accelerometer/Accelerometer.shared.cs
@@ -17,10 +17,10 @@ public static void Start(SensorSpeed sensorSpeed)
                 throw new FeatureNotSupportedException();
 
             if (IsMonitoring)
-                return;
+                throw new InvalidOperationException("Accelerometer has already been started.");
 
             IsMonitoring = true;
-            useSyncContext = sensorSpeed == SensorSpeed.Normal || sensorSpeed == SensorSpeed.UI;
+            useSyncContext = sensorSpeed == SensorSpeed.Default || sensorSpeed == SensorSpeed.UI;
 
             try
             {
@@ -68,19 +68,19 @@ internal static void OnChanged(AccelerometerChangedEventArgs e)
 
     public class AccelerometerChangedEventArgs : EventArgs
     {
-        internal AccelerometerChangedEventArgs(AccelerometerData reading) => Reading = reading;
+        public AccelerometerChangedEventArgs(AccelerometerData reading) => Reading = reading;
 
         public AccelerometerData Reading { get; }
     }
 
     public readonly struct AccelerometerData : IEquatable<AccelerometerData>
     {
-        internal AccelerometerData(double x, double y, double z)
+        public AccelerometerData(double x, double y, double z)
             : this((float)x, (float)y, (float)z)
         {
         }
 
-        internal AccelerometerData(float x, float y, float z) =>
+        public AccelerometerData(float x, float y, float z) =>
             Acceleration = new Vector3(x, y, z);
 
         public Vector3 Acceleration { get; }
diff --git a/Xamarin.Essentials/Barometer/Barometer.ios.cs b/Xamarin.Essentials/Barometer/Barometer.ios.cs
index 5e1cdd010..88a4b18e6 100644
--- a/Xamarin.Essentials/Barometer/Barometer.ios.cs
+++ b/Xamarin.Essentials/Barometer/Barometer.ios.cs
@@ -15,9 +15,8 @@ static void PlatformStart(SensorSpeed sensorSpeed)
             altitudeManager = new CMAltimeter();
             altitudeManager.StartRelativeAltitudeUpdates(Platform.GetCurrentQueue(), LocationManagerUpdatedHeading);
 
-            // Heading updates Convert to HectoPascal from KiloPascal
             void LocationManagerUpdatedHeading(CMAltitudeData e, NSError error) =>
-                OnChanged(new BarometerData(e.Pressure.DoubleValue / 10d));
+                OnChanged(new BarometerData(UnitConverters.KilopascalsToHectopascals(e.Pressure.DoubleValue)));
         }
 
         static void PlatformStop()
diff --git a/Xamarin.Essentials/Barometer/Barometer.shared.cs b/Xamarin.Essentials/Barometer/Barometer.shared.cs
index c3677f973..b22aa8681 100644
--- a/Xamarin.Essentials/Barometer/Barometer.shared.cs
+++ b/Xamarin.Essentials/Barometer/Barometer.shared.cs
@@ -16,10 +16,10 @@ public static void Start(SensorSpeed sensorSpeed)
                throw new FeatureNotSupportedException();
 
             if (IsMonitoring)
-                return;
+                throw new InvalidOperationException("Barometer has already been started.");
 
             IsMonitoring = true;
-            useSyncContext = sensorSpeed == SensorSpeed.Normal || sensorSpeed == SensorSpeed.UI;
+            useSyncContext = sensorSpeed == SensorSpeed.Default || sensorSpeed == SensorSpeed.UI;
 
             try
             {
@@ -67,7 +67,7 @@ static void OnChanged(BarometerChangedEventArgs e)
 
     public class BarometerChangedEventArgs : EventArgs
     {
-        internal BarometerChangedEventArgs(BarometerData reading) =>
+        public BarometerChangedEventArgs(BarometerData reading) =>
             Reading = reading;
 
         public BarometerData Reading { get; }
@@ -75,10 +75,10 @@ internal BarometerChangedEventArgs(BarometerData reading) =>
 
     public readonly struct BarometerData : IEquatable<BarometerData>
     {
-        internal BarometerData(double pressure) =>
-            Pressure = pressure;
+        public BarometerData(double pressure) =>
+            PressureInHectopascals = pressure;
 
-        public double Pressure { get; }
+        public double PressureInHectopascals { get; }
 
         public static bool operator ==(BarometerData left, BarometerData right) =>
             Equals(left, right);
@@ -90,11 +90,11 @@ public override bool Equals(object obj) =>
             (obj is BarometerData data) && Equals(data);
 
         public bool Equals(BarometerData other) =>
-            Pressure.Equals(other.Pressure);
+            PressureInHectopascals.Equals(other.PressureInHectopascals);
 
         public override int GetHashCode() =>
-            Pressure.GetHashCode();
+            PressureInHectopascals.GetHashCode();
 
-        public override string ToString() => $"{nameof(Pressure)}: {Pressure}";
+        public override string ToString() => $"{nameof(PressureInHectopascals)}: {PressureInHectopascals}";
     }
 }
diff --git a/Xamarin.Essentials/Battery/Battery.shared.cs b/Xamarin.Essentials/Battery/Battery.shared.cs
index a4e980fc0..efaaf8ce5 100644
--- a/Xamarin.Essentials/Battery/Battery.shared.cs
+++ b/Xamarin.Essentials/Battery/Battery.shared.cs
@@ -131,7 +131,7 @@ public enum EnergySaverStatus
 
     public class BatteryChangedEventArgs : EventArgs
     {
-        internal BatteryChangedEventArgs(double level, BatteryState state, BatteryPowerSource source)
+        public BatteryChangedEventArgs(double level, BatteryState state, BatteryPowerSource source)
         {
             ChargeLevel = level;
             State = state;
@@ -152,7 +152,7 @@ public override string ToString() =>
 
     public class EnergySaverStatusChangedEventArgs : EventArgs
     {
-        internal EnergySaverStatusChangedEventArgs(EnergySaverStatus saverStatus)
+        public EnergySaverStatusChangedEventArgs(EnergySaverStatus saverStatus)
         {
             EnergySaverStatus = saverStatus;
         }
diff --git a/Xamarin.Essentials/Compass/Compass.android.cs b/Xamarin.Essentials/Compass/Compass.android.cs
index 09c7e519c..856b1670a 100644
--- a/Xamarin.Essentials/Compass/Compass.android.cs
+++ b/Xamarin.Essentials/Compass/Compass.android.cs
@@ -14,12 +14,12 @@ public static partial class Compass
         static Sensor magnetometer;
         static Sensor accelerometer;
 
-        internal static void PlatformStart(SensorSpeed sensorSpeed)
+        internal static void PlatformStart(SensorSpeed sensorSpeed, bool applyLowPassFilter)
         {
             var delay = sensorSpeed.ToPlatform();
             accelerometer = Platform.SensorManager.GetDefaultSensor(SensorType.Accelerometer);
             magnetometer = Platform.SensorManager.GetDefaultSensor(SensorType.MagneticField);
-            listener = new SensorListener(accelerometer.Name, magnetometer.Name, delay);
+            listener = new SensorListener(accelerometer.Name, magnetometer.Name, delay, applyLowPassFilter);
             Platform.SensorManager.RegisterListener(listener, accelerometer, delay);
             Platform.SensorManager.RegisterListener(listener, magnetometer, delay);
         }
@@ -48,14 +48,16 @@ class SensorListener : Java.Lang.Object, ISensorEventListener, IDisposable
 
         string magnetometer;
         string accelerometer;
+        bool applyLowPassFilter;
 
-        internal SensorListener(string accelerometer, string magnetometer, SensorDelay delay)
+        internal SensorListener(string accelerometer, string magnetometer, SensorDelay delay, bool applyLowPassFilter)
         {
             this.magnetometer = magnetometer;
             this.accelerometer = accelerometer;
+            this.applyLowPassFilter = applyLowPassFilter;
         }
 
-        void ISensorEventListener.OnAccuracyChanged(Sensor sensor, [GeneratedEnum] SensorStatus accuracy)
+        void ISensorEventListener.OnAccuracyChanged(Sensor sensor, SensorStatus accuracy)
         {
         }
 
@@ -77,7 +79,7 @@ void ISensorEventListener.OnSensorChanged(SensorEvent e)
                 SensorManager.GetRotationMatrix(r, null, lastAccelerometer, lastMagnetometer);
                 SensorManager.GetOrientation(r, orientation);
                 var azimuthInRadians = orientation[0];
-                if (Compass.ApplyLowPassFilter)
+                if (applyLowPassFilter)
                 {
                     filter.Add(azimuthInRadians);
                     azimuthInRadians = filter.Average();
diff --git a/Xamarin.Essentials/Compass/Compass.ios.cs b/Xamarin.Essentials/Compass/Compass.ios.cs
index 4e8a491e6..a2cdef23f 100644
--- a/Xamarin.Essentials/Compass/Compass.ios.cs
+++ b/Xamarin.Essentials/Compass/Compass.ios.cs
@@ -17,7 +17,7 @@ public static partial class Compass
 
         static CLLocationManager locationManager;
 
-        internal static void PlatformStart(SensorSpeed sensorSpeed)
+        internal static void PlatformStart(SensorSpeed sensorSpeed, bool applyLowPassFilter)
         {
             locationManager = new CLLocationManager();
             locationManager.ShouldDisplayHeadingCalibration += LocationManagerShouldDisplayHeadingCalibration;
@@ -31,7 +31,7 @@ internal static void PlatformStart(SensorSpeed sensorSpeed)
                     locationManager.HeadingFilter = GameFilter;
                     locationManager.DesiredAccuracy = CLLocation.AccurracyBestForNavigation;
                     break;
-                case SensorSpeed.Normal:
+                case SensorSpeed.Default:
                     locationManager.HeadingFilter = NormalFilter;
                     locationManager.DesiredAccuracy = CLLocation.AccuracyBest;
                     break;
diff --git a/Xamarin.Essentials/Compass/Compass.netstandard.cs b/Xamarin.Essentials/Compass/Compass.netstandard.cs
index d12f54272..3d89496a9 100644
--- a/Xamarin.Essentials/Compass/Compass.netstandard.cs
+++ b/Xamarin.Essentials/Compass/Compass.netstandard.cs
@@ -5,7 +5,7 @@ public static partial class Compass
         internal static bool IsSupported =>
             throw new NotImplementedInReferenceAssemblyException();
 
-        internal static void PlatformStart(SensorSpeed sensorSpeed) =>
+        internal static void PlatformStart(SensorSpeed sensorSpeed, bool applyLowPassFilter) =>
             throw new NotImplementedInReferenceAssemblyException();
 
         internal static void PlatformStop() =>
diff --git a/Xamarin.Essentials/Compass/Compass.shared.cs b/Xamarin.Essentials/Compass/Compass.shared.cs
index 658dcace2..04ed69ba0 100644
--- a/Xamarin.Essentials/Compass/Compass.shared.cs
+++ b/Xamarin.Essentials/Compass/Compass.shared.cs
@@ -10,22 +10,22 @@ public static partial class Compass
 
         public static bool IsMonitoring { get; private set; }
 
-        public static bool ApplyLowPassFilter { get; set; }
+        public static void Start(SensorSpeed sensorSpeed) => Start(sensorSpeed, true);
 
-        public static void Start(SensorSpeed sensorSpeed)
+        public static void Start(SensorSpeed sensorSpeed, bool applyLowPassFilter)
         {
             if (!IsSupported)
                 throw new FeatureNotSupportedException();
 
             if (IsMonitoring)
-                return;
+                throw new InvalidOperationException("Compass has already been started.");
 
             IsMonitoring = true;
-            useSyncContext = sensorSpeed == SensorSpeed.Normal || sensorSpeed == SensorSpeed.UI;
+            useSyncContext = sensorSpeed == SensorSpeed.Default || sensorSpeed == SensorSpeed.UI;
 
             try
             {
-                PlatformStart(sensorSpeed);
+                PlatformStart(sensorSpeed, applyLowPassFilter);
             }
             catch
             {
@@ -69,7 +69,7 @@ internal static void OnChanged(CompassChangedEventArgs e)
 
     public class CompassChangedEventArgs : EventArgs
     {
-        internal CompassChangedEventArgs(CompassData reading) =>
+        public CompassChangedEventArgs(CompassData reading) =>
             Reading = reading;
 
         public CompassData Reading { get; }
@@ -77,7 +77,7 @@ internal CompassChangedEventArgs(CompassData reading) =>
 
     public readonly struct CompassData : IEquatable<CompassData>
     {
-        internal CompassData(double headingMagneticNorth) =>
+        public CompassData(double headingMagneticNorth) =>
             HeadingMagneticNorth = headingMagneticNorth;
 
         public double HeadingMagneticNorth { get; }
diff --git a/Xamarin.Essentials/Compass/Compass.uwp.cs b/Xamarin.Essentials/Compass/Compass.uwp.cs
index b5a2a0490..5c9548b4c 100644
--- a/Xamarin.Essentials/Compass/Compass.uwp.cs
+++ b/Xamarin.Essentials/Compass/Compass.uwp.cs
@@ -20,7 +20,7 @@ public static partial class Compass
         internal static bool IsSupported =>
             DefaultCompass != null;
 
-        internal static void PlatformStart(SensorSpeed sensorSpeed)
+        internal static void PlatformStart(SensorSpeed sensorSpeed, bool applyLowPassFilter)
         {
             sensor = DefaultCompass;
 
diff --git a/Xamarin.Essentials/Connectivity/Connectivity.shared.cs b/Xamarin.Essentials/Connectivity/Connectivity.shared.cs
index 37a76e1cb..73b79f589 100644
--- a/Xamarin.Essentials/Connectivity/Connectivity.shared.cs
+++ b/Xamarin.Essentials/Connectivity/Connectivity.shared.cs
@@ -67,7 +67,7 @@ static void OnConnectivityChanged(ConnectivityChangedEventArgs e)
 
     public class ConnectivityChangedEventArgs : EventArgs
     {
-        internal ConnectivityChangedEventArgs(NetworkAccess access, IEnumerable<ConnectionProfile> connectionProfiles)
+        public ConnectivityChangedEventArgs(NetworkAccess access, IEnumerable<ConnectionProfile> connectionProfiles)
         {
             NetworkAccess = access;
             ConnectionProfiles = connectionProfiles;
diff --git a/Xamarin.Essentials/Gyroscope/Gyroscope.shared.cs b/Xamarin.Essentials/Gyroscope/Gyroscope.shared.cs
index 3a78b2904..ad41c35a4 100644
--- a/Xamarin.Essentials/Gyroscope/Gyroscope.shared.cs
+++ b/Xamarin.Essentials/Gyroscope/Gyroscope.shared.cs
@@ -17,10 +17,10 @@ public static void Start(SensorSpeed sensorSpeed)
                 throw new FeatureNotSupportedException();
 
             if (IsMonitoring)
-                return;
+                throw new InvalidOperationException("Gyroscope has already been started.");
 
             IsMonitoring = true;
-            useSyncContext = sensorSpeed == SensorSpeed.Normal || sensorSpeed == SensorSpeed.UI;
+            useSyncContext = sensorSpeed == SensorSpeed.Default || sensorSpeed == SensorSpeed.UI;
 
             try
             {
@@ -68,7 +68,7 @@ internal static void OnChanged(GyroscopeChangedEventArgs e)
 
     public class GyroscopeChangedEventArgs : EventArgs
     {
-        internal GyroscopeChangedEventArgs(GyroscopeData reading) =>
+        public GyroscopeChangedEventArgs(GyroscopeData reading) =>
             Reading = reading;
 
         public GyroscopeData Reading { get; }
@@ -76,12 +76,12 @@ internal GyroscopeChangedEventArgs(GyroscopeData reading) =>
 
     public readonly struct GyroscopeData : IEquatable<GyroscopeData>
     {
-        internal GyroscopeData(double x, double y, double z)
+        public GyroscopeData(double x, double y, double z)
             : this((float)x, (float)y, (float)z)
         {
         }
 
-        internal GyroscopeData(float x, float y, float z) =>
+        public GyroscopeData(float x, float y, float z) =>
             AngularVelocity = new Vector3(x, y, z);
 
         public Vector3 AngularVelocity { get; }
diff --git a/Xamarin.Essentials/Magnetometer/Magnetometer.shared.cs b/Xamarin.Essentials/Magnetometer/Magnetometer.shared.cs
index e16e58553..504805e47 100644
--- a/Xamarin.Essentials/Magnetometer/Magnetometer.shared.cs
+++ b/Xamarin.Essentials/Magnetometer/Magnetometer.shared.cs
@@ -17,10 +17,10 @@ public static void Start(SensorSpeed sensorSpeed)
                 throw new FeatureNotSupportedException();
 
             if (IsMonitoring)
-                return;
+                throw new InvalidOperationException("Magnetometer has already been started.");
 
             IsMonitoring = true;
-            useSyncContext = sensorSpeed == SensorSpeed.Normal || sensorSpeed == SensorSpeed.UI;
+            useSyncContext = sensorSpeed == SensorSpeed.Default || sensorSpeed == SensorSpeed.UI;
 
             try
             {
@@ -68,7 +68,7 @@ internal static void OnChanged(MagnetometerChangedEventArgs e)
 
     public class MagnetometerChangedEventArgs : EventArgs
     {
-        internal MagnetometerChangedEventArgs(MagnetometerData reading) =>
+        public MagnetometerChangedEventArgs(MagnetometerData reading) =>
             Reading = reading;
 
         public MagnetometerData Reading { get; }
@@ -76,12 +76,12 @@ internal MagnetometerChangedEventArgs(MagnetometerData reading) =>
 
     public readonly struct MagnetometerData : IEquatable<MagnetometerData>
     {
-        internal MagnetometerData(double x, double y, double z)
+        public MagnetometerData(double x, double y, double z)
             : this((float)x, (float)y, (float)z)
         {
         }
 
-        internal MagnetometerData(float x, float y, float z) =>
+        public MagnetometerData(float x, float y, float z) =>
             MagneticField = new Vector3(x, y, z);
 
         public Vector3 MagneticField { get; }
diff --git a/Xamarin.Essentials/OrientationSensor/OrientationSensor.shared.cs b/Xamarin.Essentials/OrientationSensor/OrientationSensor.shared.cs
index 4badd4dcc..a72b8a1a9 100644
--- a/Xamarin.Essentials/OrientationSensor/OrientationSensor.shared.cs
+++ b/Xamarin.Essentials/OrientationSensor/OrientationSensor.shared.cs
@@ -17,10 +17,10 @@ public static void Start(SensorSpeed sensorSpeed)
                 throw new FeatureNotSupportedException();
 
             if (IsMonitoring)
-                return;
+                throw new InvalidOperationException("Orientation sensor has already been started.");
 
             IsMonitoring = true;
-            useSyncContext = sensorSpeed == SensorSpeed.Normal || sensorSpeed == SensorSpeed.UI;
+            useSyncContext = sensorSpeed == SensorSpeed.Default || sensorSpeed == SensorSpeed.UI;
 
             try
             {
@@ -68,7 +68,7 @@ internal static void OnChanged(OrientationSensorChangedEventArgs e)
 
     public class OrientationSensorChangedEventArgs : EventArgs
     {
-        internal OrientationSensorChangedEventArgs(OrientationSensorData reading) =>
+        public OrientationSensorChangedEventArgs(OrientationSensorData reading) =>
             Reading = reading;
 
         public OrientationSensorData Reading { get; }
@@ -76,12 +76,12 @@ internal OrientationSensorChangedEventArgs(OrientationSensorData reading) =>
 
     public readonly struct OrientationSensorData : IEquatable<OrientationSensorData>
     {
-        internal OrientationSensorData(double x, double y, double z, double w)
+        public OrientationSensorData(double x, double y, double z, double w)
             : this((float)x, (float)y, (float)z, (float)w)
         {
         }
 
-        internal OrientationSensorData(float x, float y, float z, float w) =>
+        public OrientationSensorData(float x, float y, float z, float w) =>
             Orientation = new Quaternion(x, y, z, w);
 
         public Quaternion Orientation { get; }
diff --git a/Xamarin.Essentials/Types/Location.shared.cs b/Xamarin.Essentials/Types/Location.shared.cs
index 4675e5cfb..442abfab9 100644
--- a/Xamarin.Essentials/Types/Location.shared.cs
+++ b/Xamarin.Essentials/Types/Location.shared.cs
@@ -57,46 +57,32 @@ public Location(Location point)
         public double? Course { get; set; }
 
         public static double CalculateDistance(double latitudeStart, double longitudeStart, Location locationEnd, DistanceUnits units) =>
-            CalculateDistance(latitudeStart, locationEnd.Latitude, longitudeStart, locationEnd.Longitude, units);
+            CalculateDistance(latitudeStart, longitudeStart, locationEnd.Latitude, locationEnd.Longitude, units);
 
         public static double CalculateDistance(Location locationStart, double latitudeEnd, double longitudeEnd, DistanceUnits units) =>
-           CalculateDistance(locationStart.Latitude, latitudeEnd, locationStart.Longitude, longitudeEnd, units);
+           CalculateDistance(locationStart.Latitude, locationStart.Longitude, latitudeEnd, longitudeEnd, units);
 
         public static double CalculateDistance(Location locationStart, Location locationEnd, DistanceUnits units) =>
-            CalculateDistance(locationStart.Latitude, locationEnd.Latitude, locationStart.Longitude, locationEnd.Longitude, units);
+            CalculateDistance(locationStart.Latitude, locationStart.Longitude, locationEnd.Latitude, locationEnd.Longitude, units);
 
         public static double CalculateDistance(
             double latitudeStart,
-            double latitudeEnd,
             double longitudeStart,
+            double latitudeEnd,
             double longitudeEnd,
             DistanceUnits units)
         {
-            if (latitudeEnd == latitudeStart && longitudeEnd == longitudeStart)
-                return 0;
-
-            var rlat1 = PI * latitudeStart / 180.0;
-            var rlat2 = PI * latitudeEnd / 180.0;
-            var theta = longitudeStart - longitudeEnd;
-            var rtheta = PI * theta / 180.0;
-            var dist = (Sin(rlat1) * Sin(rlat2)) + (Cos(rlat1) * Cos(rlat2) * Cos(rtheta));
-            dist = Acos(dist);
-            dist = dist * 180.0 / PI;
-            var final = dist * 60.0 * 1.1515;
-            if (double.IsNaN(final) || double.IsInfinity(final) || double.IsNegativeInfinity(final) ||
-                double.IsPositiveInfinity(final) || final < 0)
-                return 0;
-
-            if (units == DistanceUnits.Kilometers)
-                return MilesToKilometers(final);
-
-            return final;
+            switch (units)
+            {
+                case DistanceUnits.Kilometers:
+                    return UnitConverters.CoordinatesToKilometers(latitudeStart, longitudeStart, latitudeEnd, longitudeEnd);
+                case DistanceUnits.Miles:
+                    return UnitConverters.CoordinatesToMiles(latitudeStart, longitudeStart, latitudeEnd, longitudeEnd);
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(units));
+            }
         }
 
-        public static double MilesToKilometers(double miles) => miles * 1.609344;
-
-        public static double KilometersToMiles(double kilometers) => kilometers * .62137119;
-
         public override string ToString() =>
             $"{nameof(Latitude)}: {Latitude}, {nameof(Longitude)}: {Longitude}, " +
             $"{nameof(Altitude)}: {Altitude ?? 0}, {nameof(Accuracy)}: {Accuracy ?? 0}, " +
diff --git a/Xamarin.Essentials/Types/SensorSpeed.shared.cs b/Xamarin.Essentials/Types/SensorSpeed.shared.cs
index 7ad50ef2f..211769873 100644
--- a/Xamarin.Essentials/Types/SensorSpeed.shared.cs
+++ b/Xamarin.Essentials/Types/SensorSpeed.shared.cs
@@ -2,9 +2,9 @@
 {
     public enum SensorSpeed
     {
-        Fastest,
-        Game,
-        UI,
-        Normal,
+        Default = 0,
+        UI = 1,
+        Game = 2,
+        Fastest = 3,
     }
 }
diff --git a/Xamarin.Essentials/Types/UnitConverters.shared.cs b/Xamarin.Essentials/Types/UnitConverters.shared.cs
new file mode 100644
index 000000000..f789434c1
--- /dev/null
+++ b/Xamarin.Essentials/Types/UnitConverters.shared.cs
@@ -0,0 +1,104 @@
+using System;
+
+namespace Xamarin.Essentials
+{
+    public static class UnitConverters
+    {
+        const double twoPi = 2.0 * Math.PI;
+        const double totalDegrees = 360.0;
+        const double atmospherePascals = 101325.0;
+        const double degreesToRadians = Math.PI / 180.0;
+        const double milesToKilometers = 1.609344;
+        const double milesToMeters = 1609.344;
+        const double kilometersToMiles = 1.0 / milesToKilometers;
+        const double celsiusToKelvin = 273.15;
+
+        const double meanEarthRadiusInKilometers = 6371.0;
+
+        public static double FahrenheitToCelsius(double fahrenheit) =>
+            (fahrenheit - 32.0) / 1.8;
+
+        public static double CelsiusToFahrenheit(double celsius) =>
+            (celsius * 1.8) + 32.0;
+
+        public static double CelsiusToKelvin(double celsius) =>
+           celsius + celsiusToKelvin;
+
+        public static double KelvinToCelsius(double kelvin) =>
+           kelvin - celsiusToKelvin;
+
+        public static double MilesToMeters(double miles) =>
+            miles * milesToMeters;
+
+        public static double MilesToKilometers(double miles) =>
+            miles * milesToKilometers;
+
+        public static double KilometersToMiles(double kilometers) =>
+            kilometers * kilometersToMiles;
+
+        public static double DegreesToRadians(double degrees) =>
+            degrees * degreesToRadians;
+
+        public static double RadiansToDegrees(double radians) =>
+            radians / degreesToRadians;
+
+        public static double DegreesPerSecondToRadiansPerSecond(double degrees) =>
+            HertzToRadiansPerSecond(DegreesPerSecondToHertz(degrees));
+
+        public static double RadiansPerSecondToDegreesPerSecond(double radians) =>
+            HertzToDegreesPerSecond(RadiansPerSecondToHertz(radians));
+
+        public static double DegreesPerSecondToHertz(double degrees) =>
+            degrees / totalDegrees;
+
+        public static double RadiansPerSecondToHertz(double radians) =>
+            radians / twoPi;
+
+        public static double HertzToDegreesPerSecond(double hertz) =>
+            hertz * totalDegrees;
+
+        public static double HertzToRadiansPerSecond(double hertz) =>
+            hertz * twoPi;
+
+        public static double KilopascalsToHectopascals(double kpa) =>
+            kpa * 10.0;
+
+        public static double HectopascalsToKilopascals(double hpa) =>
+            hpa / 10.0;
+
+        public static double KilopascalsToPascals(double kpa) =>
+            kpa * 1000.0;
+
+        public static double HectopascalsToPascals(double hpa) =>
+            hpa * 100.0;
+
+        public static double AtmospheresToPascals(double atm) =>
+            atm / atmospherePascals;
+
+        public static double PascalsToAtmospheres(double pascals) =>
+            pascals * atmospherePascals;
+
+        public static double CoordinatesToMiles(double lat1, double lon1, double lat2, double lon2) =>
+            KilometersToMiles(CoordinatesToKilometers(lat1, lon1, lat2, lon2));
+
+        public static double CoordinatesToKilometers(double lat1, double lon1, double lat2, double lon2)
+        {
+            if (lat1 == lat2 && lon1 == lon2)
+                return 0;
+
+            var dLat = DegreesToRadians(lat2 - lat1);
+            var dLon = DegreesToRadians(lon2 - lon1);
+
+            lat1 = DegreesToRadians(lat1);
+            lat2 = DegreesToRadians(lat2);
+
+            var dLat2 = Math.Sin(dLat / 2) * Math.Sin(dLat / 2);
+            var dLon2 = Math.Sin(dLon / 2) * Math.Sin(dLon / 2);
+
+            var a = dLat2 + (dLon2 * Math.Cos(lat1) * Math.Cos(lat2));
+            var c = 2 * Math.Asin(Math.Sqrt(a));
+
+            return meanEarthRadiusInKilometers * c;
+        }
+    }
+}
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-android.xml b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
index b1b779146..e41b5e171 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-android.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-android.xml
@@ -10,9 +10,12 @@
       <Member Id="P:Xamarin.Essentials.Accelerometer.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.AccelerometerChangedEventArgs" Id="T:Xamarin.Essentials.AccelerometerChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.AccelerometerChangedEventArgs.#ctor(Xamarin.Essentials.AccelerometerData)" />
       <Member Id="P:Xamarin.Essentials.AccelerometerChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.AccelerometerData" Id="T:Xamarin.Essentials.AccelerometerData">
+      <Member Id="M:Xamarin.Essentials.AccelerometerData.#ctor(System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.AccelerometerData.#ctor(System.Single,System.Single,System.Single)" />
       <Member Id="M:Xamarin.Essentials.AccelerometerData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.AccelerometerData.Equals(Xamarin.Essentials.AccelerometerData)" />
       <Member Id="M:Xamarin.Essentials.AccelerometerData.GetHashCode" />
@@ -36,16 +39,18 @@
       <Member Id="P:Xamarin.Essentials.Barometer.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.BarometerChangedEventArgs" Id="T:Xamarin.Essentials.BarometerChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.BarometerChangedEventArgs.#ctor(Xamarin.Essentials.BarometerData)" />
       <Member Id="P:Xamarin.Essentials.BarometerChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.BarometerData" Id="T:Xamarin.Essentials.BarometerData">
+      <Member Id="M:Xamarin.Essentials.BarometerData.#ctor(System.Double)" />
       <Member Id="M:Xamarin.Essentials.BarometerData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.BarometerData.Equals(Xamarin.Essentials.BarometerData)" />
       <Member Id="M:Xamarin.Essentials.BarometerData.GetHashCode" />
       <Member Id="M:Xamarin.Essentials.BarometerData.op_Equality(Xamarin.Essentials.BarometerData,Xamarin.Essentials.BarometerData)" />
       <Member Id="M:Xamarin.Essentials.BarometerData.op_Inequality(Xamarin.Essentials.BarometerData,Xamarin.Essentials.BarometerData)" />
       <Member Id="M:Xamarin.Essentials.BarometerData.ToString" />
-      <Member Id="P:Xamarin.Essentials.BarometerData.Pressure" />
+      <Member Id="P:Xamarin.Essentials.BarometerData.PressureInHectopascals" />
     </Type>
     <Type Name="Xamarin.Essentials.Battery" Id="T:Xamarin.Essentials.Battery">
       <Member Id="E:Xamarin.Essentials.Battery.BatteryChanged" />
@@ -56,6 +61,7 @@
       <Member Id="P:Xamarin.Essentials.Battery.State" />
     </Type>
     <Type Name="Xamarin.Essentials.BatteryChangedEventArgs" Id="T:Xamarin.Essentials.BatteryChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.BatteryChangedEventArgs.#ctor(System.Double,Xamarin.Essentials.BatteryState,Xamarin.Essentials.BatteryPowerSource)" />
       <Member Id="M:Xamarin.Essentials.BatteryChangedEventArgs.ToString" />
       <Member Id="P:Xamarin.Essentials.BatteryChangedEventArgs.ChargeLevel" />
       <Member Id="P:Xamarin.Essentials.BatteryChangedEventArgs.PowerSource" />
@@ -94,14 +100,16 @@
     <Type Name="Xamarin.Essentials.Compass" Id="T:Xamarin.Essentials.Compass">
       <Member Id="E:Xamarin.Essentials.Compass.ReadingChanged" />
       <Member Id="M:Xamarin.Essentials.Compass.Start(Xamarin.Essentials.SensorSpeed)" />
+      <Member Id="M:Xamarin.Essentials.Compass.Start(Xamarin.Essentials.SensorSpeed,System.Boolean)" />
       <Member Id="M:Xamarin.Essentials.Compass.Stop" />
-      <Member Id="P:Xamarin.Essentials.Compass.ApplyLowPassFilter" />
       <Member Id="P:Xamarin.Essentials.Compass.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.CompassChangedEventArgs" Id="T:Xamarin.Essentials.CompassChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.CompassChangedEventArgs.#ctor(Xamarin.Essentials.CompassData)" />
       <Member Id="P:Xamarin.Essentials.CompassChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.CompassData" Id="T:Xamarin.Essentials.CompassData">
+      <Member Id="M:Xamarin.Essentials.CompassData.#ctor(System.Double)" />
       <Member Id="M:Xamarin.Essentials.CompassData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.CompassData.Equals(Xamarin.Essentials.CompassData)" />
       <Member Id="M:Xamarin.Essentials.CompassData.GetHashCode" />
@@ -123,6 +131,7 @@
       <Member Id="P:Xamarin.Essentials.Connectivity.NetworkAccess" />
     </Type>
     <Type Name="Xamarin.Essentials.ConnectivityChangedEventArgs" Id="T:Xamarin.Essentials.ConnectivityChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.ConnectivityChangedEventArgs.#ctor(Xamarin.Essentials.NetworkAccess,System.Collections.Generic.IEnumerable{Xamarin.Essentials.ConnectionProfile})" />
       <Member Id="M:Xamarin.Essentials.ConnectivityChangedEventArgs.ToString" />
       <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.ConnectionProfiles" />
       <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.NetworkAccess" />
@@ -233,6 +242,7 @@
       <Member Id="F:Xamarin.Essentials.EnergySaverStatus.Unknown" />
     </Type>
     <Type Name="Xamarin.Essentials.EnergySaverStatusChangedEventArgs" Id="T:Xamarin.Essentials.EnergySaverStatusChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.EnergySaverStatusChangedEventArgs.#ctor(Xamarin.Essentials.EnergySaverStatus)" />
       <Member Id="M:Xamarin.Essentials.EnergySaverStatusChangedEventArgs.ToString" />
       <Member Id="P:Xamarin.Essentials.EnergySaverStatusChangedEventArgs.EnergySaverStatus" />
     </Type>
@@ -289,9 +299,12 @@
       <Member Id="P:Xamarin.Essentials.Gyroscope.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.GyroscopeChangedEventArgs" Id="T:Xamarin.Essentials.GyroscopeChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.GyroscopeChangedEventArgs.#ctor(Xamarin.Essentials.GyroscopeData)" />
       <Member Id="P:Xamarin.Essentials.GyroscopeChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.GyroscopeData" Id="T:Xamarin.Essentials.GyroscopeData">
+      <Member Id="M:Xamarin.Essentials.GyroscopeData.#ctor(System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.GyroscopeData.#ctor(System.Single,System.Single,System.Single)" />
       <Member Id="M:Xamarin.Essentials.GyroscopeData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.GyroscopeData.Equals(Xamarin.Essentials.GyroscopeData)" />
       <Member Id="M:Xamarin.Essentials.GyroscopeData.GetHashCode" />
@@ -321,8 +334,6 @@
       <Member Id="M:Xamarin.Essentials.Location.CalculateDistance(System.Double,System.Double,Xamarin.Essentials.Location,Xamarin.Essentials.DistanceUnits)" />
       <Member Id="M:Xamarin.Essentials.Location.CalculateDistance(Xamarin.Essentials.Location,System.Double,System.Double,Xamarin.Essentials.DistanceUnits)" />
       <Member Id="M:Xamarin.Essentials.Location.CalculateDistance(Xamarin.Essentials.Location,Xamarin.Essentials.Location,Xamarin.Essentials.DistanceUnits)" />
-      <Member Id="M:Xamarin.Essentials.Location.KilometersToMiles(System.Double)" />
-      <Member Id="M:Xamarin.Essentials.Location.MilesToKilometers(System.Double)" />
       <Member Id="M:Xamarin.Essentials.Location.ToString" />
       <Member Id="P:Xamarin.Essentials.Location.Accuracy" />
       <Member Id="P:Xamarin.Essentials.Location.Altitude" />
@@ -345,9 +356,12 @@
       <Member Id="P:Xamarin.Essentials.Magnetometer.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.MagnetometerChangedEventArgs" Id="T:Xamarin.Essentials.MagnetometerChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.MagnetometerChangedEventArgs.#ctor(Xamarin.Essentials.MagnetometerData)" />
       <Member Id="P:Xamarin.Essentials.MagnetometerChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.MagnetometerData" Id="T:Xamarin.Essentials.MagnetometerData">
+      <Member Id="M:Xamarin.Essentials.MagnetometerData.#ctor(System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.MagnetometerData.#ctor(System.Single,System.Single,System.Single)" />
       <Member Id="M:Xamarin.Essentials.MagnetometerData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.MagnetometerData.Equals(Xamarin.Essentials.MagnetometerData)" />
       <Member Id="M:Xamarin.Essentials.MagnetometerData.GetHashCode" />
@@ -398,9 +412,12 @@
       <Member Id="P:Xamarin.Essentials.OrientationSensor.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.OrientationSensorChangedEventArgs" Id="T:Xamarin.Essentials.OrientationSensorChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.OrientationSensorChangedEventArgs.#ctor(Xamarin.Essentials.OrientationSensorData)" />
       <Member Id="P:Xamarin.Essentials.OrientationSensorChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.OrientationSensorData" Id="T:Xamarin.Essentials.OrientationSensorData">
+      <Member Id="M:Xamarin.Essentials.OrientationSensorData.#ctor(System.Double,System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.OrientationSensorData.#ctor(System.Single,System.Single,System.Single,System.Single)" />
       <Member Id="M:Xamarin.Essentials.OrientationSensorData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.OrientationSensorData.Equals(Xamarin.Essentials.OrientationSensorData)" />
       <Member Id="M:Xamarin.Essentials.OrientationSensorData.GetHashCode" />
@@ -483,9 +500,9 @@
       <Member Id="M:Xamarin.Essentials.SecureStorage.SetAsync(System.String,System.String)" />
     </Type>
     <Type Name="Xamarin.Essentials.SensorSpeed" Id="T:Xamarin.Essentials.SensorSpeed">
+      <Member Id="F:Xamarin.Essentials.SensorSpeed.Default" />
       <Member Id="F:Xamarin.Essentials.SensorSpeed.Fastest" />
       <Member Id="F:Xamarin.Essentials.SensorSpeed.Game" />
-      <Member Id="F:Xamarin.Essentials.SensorSpeed.Normal" />
       <Member Id="F:Xamarin.Essentials.SensorSpeed.UI" />
     </Type>
     <Type Name="Xamarin.Essentials.Share" Id="T:Xamarin.Essentials.Share">
@@ -523,6 +540,31 @@
       <Member Id="M:Xamarin.Essentials.TextToSpeech.SpeakAsync(System.String,System.Threading.CancellationToken)" />
       <Member Id="M:Xamarin.Essentials.TextToSpeech.SpeakAsync(System.String,Xamarin.Essentials.SpeechOptions,System.Threading.CancellationToken)" />
     </Type>
+    <Type Name="Xamarin.Essentials.UnitConverters" Id="T:Xamarin.Essentials.UnitConverters">
+      <Member Id="M:Xamarin.Essentials.UnitConverters.AtmospheresToPascals(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.CelsiusToFahrenheit(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.CelsiusToKelvin(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.CoordinatesToKilometers(System.Double,System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.CoordinatesToMiles(System.Double,System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.DegreesPerSecondToHertz(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.DegreesPerSecondToRadiansPerSecond(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.DegreesToRadians(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.FahrenheitToCelsius(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.HectopascalsToKilopascals(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.HectopascalsToPascals(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.HertzToDegreesPerSecond(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.HertzToRadiansPerSecond(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.KelvinToCelsius(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.KilometersToMiles(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.KilopascalsToHectopascals(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.KilopascalsToPascals(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.MilesToKilometers(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.MilesToMeters(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.PascalsToAtmospheres(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.RadiansPerSecondToDegreesPerSecond(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.RadiansPerSecondToHertz(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.RadiansToDegrees(System.Double)" />
+    </Type>
     <Type Name="Xamarin.Essentials.VersionTracking" Id="T:Xamarin.Essentials.VersionTracking">
       <Member Id="M:Xamarin.Essentials.VersionTracking.IsFirstLaunchForBuild(System.String)" />
       <Member Id="M:Xamarin.Essentials.VersionTracking.IsFirstLaunchForVersion(System.String)" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
index 57d9ea21f..32d3d39a5 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-ios.xml
@@ -10,9 +10,12 @@
       <Member Id="P:Xamarin.Essentials.Accelerometer.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.AccelerometerChangedEventArgs" Id="T:Xamarin.Essentials.AccelerometerChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.AccelerometerChangedEventArgs.#ctor(Xamarin.Essentials.AccelerometerData)" />
       <Member Id="P:Xamarin.Essentials.AccelerometerChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.AccelerometerData" Id="T:Xamarin.Essentials.AccelerometerData">
+      <Member Id="M:Xamarin.Essentials.AccelerometerData.#ctor(System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.AccelerometerData.#ctor(System.Single,System.Single,System.Single)" />
       <Member Id="M:Xamarin.Essentials.AccelerometerData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.AccelerometerData.Equals(Xamarin.Essentials.AccelerometerData)" />
       <Member Id="M:Xamarin.Essentials.AccelerometerData.GetHashCode" />
@@ -36,16 +39,18 @@
       <Member Id="P:Xamarin.Essentials.Barometer.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.BarometerChangedEventArgs" Id="T:Xamarin.Essentials.BarometerChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.BarometerChangedEventArgs.#ctor(Xamarin.Essentials.BarometerData)" />
       <Member Id="P:Xamarin.Essentials.BarometerChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.BarometerData" Id="T:Xamarin.Essentials.BarometerData">
+      <Member Id="M:Xamarin.Essentials.BarometerData.#ctor(System.Double)" />
       <Member Id="M:Xamarin.Essentials.BarometerData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.BarometerData.Equals(Xamarin.Essentials.BarometerData)" />
       <Member Id="M:Xamarin.Essentials.BarometerData.GetHashCode" />
       <Member Id="M:Xamarin.Essentials.BarometerData.op_Equality(Xamarin.Essentials.BarometerData,Xamarin.Essentials.BarometerData)" />
       <Member Id="M:Xamarin.Essentials.BarometerData.op_Inequality(Xamarin.Essentials.BarometerData,Xamarin.Essentials.BarometerData)" />
       <Member Id="M:Xamarin.Essentials.BarometerData.ToString" />
-      <Member Id="P:Xamarin.Essentials.BarometerData.Pressure" />
+      <Member Id="P:Xamarin.Essentials.BarometerData.PressureInHectopascals" />
     </Type>
     <Type Name="Xamarin.Essentials.Battery" Id="T:Xamarin.Essentials.Battery">
       <Member Id="E:Xamarin.Essentials.Battery.BatteryChanged" />
@@ -56,6 +61,7 @@
       <Member Id="P:Xamarin.Essentials.Battery.State" />
     </Type>
     <Type Name="Xamarin.Essentials.BatteryChangedEventArgs" Id="T:Xamarin.Essentials.BatteryChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.BatteryChangedEventArgs.#ctor(System.Double,Xamarin.Essentials.BatteryState,Xamarin.Essentials.BatteryPowerSource)" />
       <Member Id="M:Xamarin.Essentials.BatteryChangedEventArgs.ToString" />
       <Member Id="P:Xamarin.Essentials.BatteryChangedEventArgs.ChargeLevel" />
       <Member Id="P:Xamarin.Essentials.BatteryChangedEventArgs.PowerSource" />
@@ -94,15 +100,17 @@
     <Type Name="Xamarin.Essentials.Compass" Id="T:Xamarin.Essentials.Compass">
       <Member Id="E:Xamarin.Essentials.Compass.ReadingChanged" />
       <Member Id="M:Xamarin.Essentials.Compass.Start(Xamarin.Essentials.SensorSpeed)" />
+      <Member Id="M:Xamarin.Essentials.Compass.Start(Xamarin.Essentials.SensorSpeed,System.Boolean)" />
       <Member Id="M:Xamarin.Essentials.Compass.Stop" />
-      <Member Id="P:Xamarin.Essentials.Compass.ApplyLowPassFilter" />
       <Member Id="P:Xamarin.Essentials.Compass.IsMonitoring" />
       <Member Id="P:Xamarin.Essentials.Compass.ShouldDisplayHeadingCalibration" />
     </Type>
     <Type Name="Xamarin.Essentials.CompassChangedEventArgs" Id="T:Xamarin.Essentials.CompassChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.CompassChangedEventArgs.#ctor(Xamarin.Essentials.CompassData)" />
       <Member Id="P:Xamarin.Essentials.CompassChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.CompassData" Id="T:Xamarin.Essentials.CompassData">
+      <Member Id="M:Xamarin.Essentials.CompassData.#ctor(System.Double)" />
       <Member Id="M:Xamarin.Essentials.CompassData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.CompassData.Equals(Xamarin.Essentials.CompassData)" />
       <Member Id="M:Xamarin.Essentials.CompassData.GetHashCode" />
@@ -124,6 +132,7 @@
       <Member Id="P:Xamarin.Essentials.Connectivity.NetworkAccess" />
     </Type>
     <Type Name="Xamarin.Essentials.ConnectivityChangedEventArgs" Id="T:Xamarin.Essentials.ConnectivityChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.ConnectivityChangedEventArgs.#ctor(Xamarin.Essentials.NetworkAccess,System.Collections.Generic.IEnumerable{Xamarin.Essentials.ConnectionProfile})" />
       <Member Id="M:Xamarin.Essentials.ConnectivityChangedEventArgs.ToString" />
       <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.ConnectionProfiles" />
       <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.NetworkAccess" />
@@ -234,6 +243,7 @@
       <Member Id="F:Xamarin.Essentials.EnergySaverStatus.Unknown" />
     </Type>
     <Type Name="Xamarin.Essentials.EnergySaverStatusChangedEventArgs" Id="T:Xamarin.Essentials.EnergySaverStatusChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.EnergySaverStatusChangedEventArgs.#ctor(Xamarin.Essentials.EnergySaverStatus)" />
       <Member Id="M:Xamarin.Essentials.EnergySaverStatusChangedEventArgs.ToString" />
       <Member Id="P:Xamarin.Essentials.EnergySaverStatusChangedEventArgs.EnergySaverStatus" />
     </Type>
@@ -290,9 +300,12 @@
       <Member Id="P:Xamarin.Essentials.Gyroscope.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.GyroscopeChangedEventArgs" Id="T:Xamarin.Essentials.GyroscopeChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.GyroscopeChangedEventArgs.#ctor(Xamarin.Essentials.GyroscopeData)" />
       <Member Id="P:Xamarin.Essentials.GyroscopeChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.GyroscopeData" Id="T:Xamarin.Essentials.GyroscopeData">
+      <Member Id="M:Xamarin.Essentials.GyroscopeData.#ctor(System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.GyroscopeData.#ctor(System.Single,System.Single,System.Single)" />
       <Member Id="M:Xamarin.Essentials.GyroscopeData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.GyroscopeData.Equals(Xamarin.Essentials.GyroscopeData)" />
       <Member Id="M:Xamarin.Essentials.GyroscopeData.GetHashCode" />
@@ -322,8 +335,6 @@
       <Member Id="M:Xamarin.Essentials.Location.CalculateDistance(System.Double,System.Double,Xamarin.Essentials.Location,Xamarin.Essentials.DistanceUnits)" />
       <Member Id="M:Xamarin.Essentials.Location.CalculateDistance(Xamarin.Essentials.Location,System.Double,System.Double,Xamarin.Essentials.DistanceUnits)" />
       <Member Id="M:Xamarin.Essentials.Location.CalculateDistance(Xamarin.Essentials.Location,Xamarin.Essentials.Location,Xamarin.Essentials.DistanceUnits)" />
-      <Member Id="M:Xamarin.Essentials.Location.KilometersToMiles(System.Double)" />
-      <Member Id="M:Xamarin.Essentials.Location.MilesToKilometers(System.Double)" />
       <Member Id="M:Xamarin.Essentials.Location.ToString" />
       <Member Id="P:Xamarin.Essentials.Location.Accuracy" />
       <Member Id="P:Xamarin.Essentials.Location.Altitude" />
@@ -346,9 +357,12 @@
       <Member Id="P:Xamarin.Essentials.Magnetometer.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.MagnetometerChangedEventArgs" Id="T:Xamarin.Essentials.MagnetometerChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.MagnetometerChangedEventArgs.#ctor(Xamarin.Essentials.MagnetometerData)" />
       <Member Id="P:Xamarin.Essentials.MagnetometerChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.MagnetometerData" Id="T:Xamarin.Essentials.MagnetometerData">
+      <Member Id="M:Xamarin.Essentials.MagnetometerData.#ctor(System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.MagnetometerData.#ctor(System.Single,System.Single,System.Single)" />
       <Member Id="M:Xamarin.Essentials.MagnetometerData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.MagnetometerData.Equals(Xamarin.Essentials.MagnetometerData)" />
       <Member Id="M:Xamarin.Essentials.MagnetometerData.GetHashCode" />
@@ -399,9 +413,12 @@
       <Member Id="P:Xamarin.Essentials.OrientationSensor.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.OrientationSensorChangedEventArgs" Id="T:Xamarin.Essentials.OrientationSensorChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.OrientationSensorChangedEventArgs.#ctor(Xamarin.Essentials.OrientationSensorData)" />
       <Member Id="P:Xamarin.Essentials.OrientationSensorChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.OrientationSensorData" Id="T:Xamarin.Essentials.OrientationSensorData">
+      <Member Id="M:Xamarin.Essentials.OrientationSensorData.#ctor(System.Double,System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.OrientationSensorData.#ctor(System.Single,System.Single,System.Single,System.Single)" />
       <Member Id="M:Xamarin.Essentials.OrientationSensorData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.OrientationSensorData.Equals(Xamarin.Essentials.OrientationSensorData)" />
       <Member Id="M:Xamarin.Essentials.OrientationSensorData.GetHashCode" />
@@ -482,9 +499,9 @@
       <Member Id="P:Xamarin.Essentials.SecureStorage.DefaultAccessible" />
     </Type>
     <Type Name="Xamarin.Essentials.SensorSpeed" Id="T:Xamarin.Essentials.SensorSpeed">
+      <Member Id="F:Xamarin.Essentials.SensorSpeed.Default" />
       <Member Id="F:Xamarin.Essentials.SensorSpeed.Fastest" />
       <Member Id="F:Xamarin.Essentials.SensorSpeed.Game" />
-      <Member Id="F:Xamarin.Essentials.SensorSpeed.Normal" />
       <Member Id="F:Xamarin.Essentials.SensorSpeed.UI" />
     </Type>
     <Type Name="Xamarin.Essentials.Share" Id="T:Xamarin.Essentials.Share">
@@ -522,6 +539,31 @@
       <Member Id="M:Xamarin.Essentials.TextToSpeech.SpeakAsync(System.String,System.Threading.CancellationToken)" />
       <Member Id="M:Xamarin.Essentials.TextToSpeech.SpeakAsync(System.String,Xamarin.Essentials.SpeechOptions,System.Threading.CancellationToken)" />
     </Type>
+    <Type Name="Xamarin.Essentials.UnitConverters" Id="T:Xamarin.Essentials.UnitConverters">
+      <Member Id="M:Xamarin.Essentials.UnitConverters.AtmospheresToPascals(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.CelsiusToFahrenheit(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.CelsiusToKelvin(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.CoordinatesToKilometers(System.Double,System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.CoordinatesToMiles(System.Double,System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.DegreesPerSecondToHertz(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.DegreesPerSecondToRadiansPerSecond(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.DegreesToRadians(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.FahrenheitToCelsius(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.HectopascalsToKilopascals(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.HectopascalsToPascals(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.HertzToDegreesPerSecond(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.HertzToRadiansPerSecond(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.KelvinToCelsius(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.KilometersToMiles(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.KilopascalsToHectopascals(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.KilopascalsToPascals(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.MilesToKilometers(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.MilesToMeters(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.PascalsToAtmospheres(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.RadiansPerSecondToDegreesPerSecond(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.RadiansPerSecondToHertz(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.RadiansToDegrees(System.Double)" />
+    </Type>
     <Type Name="Xamarin.Essentials.VersionTracking" Id="T:Xamarin.Essentials.VersionTracking">
       <Member Id="M:Xamarin.Essentials.VersionTracking.IsFirstLaunchForBuild(System.String)" />
       <Member Id="M:Xamarin.Essentials.VersionTracking.IsFirstLaunchForVersion(System.String)" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
index e9dfb9b57..5880c73e7 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials-uwp.xml
@@ -10,9 +10,12 @@
       <Member Id="P:Xamarin.Essentials.Accelerometer.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.AccelerometerChangedEventArgs" Id="T:Xamarin.Essentials.AccelerometerChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.AccelerometerChangedEventArgs.#ctor(Xamarin.Essentials.AccelerometerData)" />
       <Member Id="P:Xamarin.Essentials.AccelerometerChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.AccelerometerData" Id="T:Xamarin.Essentials.AccelerometerData">
+      <Member Id="M:Xamarin.Essentials.AccelerometerData.#ctor(System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.AccelerometerData.#ctor(System.Single,System.Single,System.Single)" />
       <Member Id="M:Xamarin.Essentials.AccelerometerData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.AccelerometerData.Equals(Xamarin.Essentials.AccelerometerData)" />
       <Member Id="M:Xamarin.Essentials.AccelerometerData.GetHashCode" />
@@ -36,16 +39,18 @@
       <Member Id="P:Xamarin.Essentials.Barometer.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.BarometerChangedEventArgs" Id="T:Xamarin.Essentials.BarometerChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.BarometerChangedEventArgs.#ctor(Xamarin.Essentials.BarometerData)" />
       <Member Id="P:Xamarin.Essentials.BarometerChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.BarometerData" Id="T:Xamarin.Essentials.BarometerData">
+      <Member Id="M:Xamarin.Essentials.BarometerData.#ctor(System.Double)" />
       <Member Id="M:Xamarin.Essentials.BarometerData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.BarometerData.Equals(Xamarin.Essentials.BarometerData)" />
       <Member Id="M:Xamarin.Essentials.BarometerData.GetHashCode" />
       <Member Id="M:Xamarin.Essentials.BarometerData.op_Equality(Xamarin.Essentials.BarometerData,Xamarin.Essentials.BarometerData)" />
       <Member Id="M:Xamarin.Essentials.BarometerData.op_Inequality(Xamarin.Essentials.BarometerData,Xamarin.Essentials.BarometerData)" />
       <Member Id="M:Xamarin.Essentials.BarometerData.ToString" />
-      <Member Id="P:Xamarin.Essentials.BarometerData.Pressure" />
+      <Member Id="P:Xamarin.Essentials.BarometerData.PressureInHectopascals" />
     </Type>
     <Type Name="Xamarin.Essentials.Battery" Id="T:Xamarin.Essentials.Battery">
       <Member Id="E:Xamarin.Essentials.Battery.BatteryChanged" />
@@ -56,6 +61,7 @@
       <Member Id="P:Xamarin.Essentials.Battery.State" />
     </Type>
     <Type Name="Xamarin.Essentials.BatteryChangedEventArgs" Id="T:Xamarin.Essentials.BatteryChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.BatteryChangedEventArgs.#ctor(System.Double,Xamarin.Essentials.BatteryState,Xamarin.Essentials.BatteryPowerSource)" />
       <Member Id="M:Xamarin.Essentials.BatteryChangedEventArgs.ToString" />
       <Member Id="P:Xamarin.Essentials.BatteryChangedEventArgs.ChargeLevel" />
       <Member Id="P:Xamarin.Essentials.BatteryChangedEventArgs.PowerSource" />
@@ -94,14 +100,16 @@
     <Type Name="Xamarin.Essentials.Compass" Id="T:Xamarin.Essentials.Compass">
       <Member Id="E:Xamarin.Essentials.Compass.ReadingChanged" />
       <Member Id="M:Xamarin.Essentials.Compass.Start(Xamarin.Essentials.SensorSpeed)" />
+      <Member Id="M:Xamarin.Essentials.Compass.Start(Xamarin.Essentials.SensorSpeed,System.Boolean)" />
       <Member Id="M:Xamarin.Essentials.Compass.Stop" />
-      <Member Id="P:Xamarin.Essentials.Compass.ApplyLowPassFilter" />
       <Member Id="P:Xamarin.Essentials.Compass.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.CompassChangedEventArgs" Id="T:Xamarin.Essentials.CompassChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.CompassChangedEventArgs.#ctor(Xamarin.Essentials.CompassData)" />
       <Member Id="P:Xamarin.Essentials.CompassChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.CompassData" Id="T:Xamarin.Essentials.CompassData">
+      <Member Id="M:Xamarin.Essentials.CompassData.#ctor(System.Double)" />
       <Member Id="M:Xamarin.Essentials.CompassData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.CompassData.Equals(Xamarin.Essentials.CompassData)" />
       <Member Id="M:Xamarin.Essentials.CompassData.GetHashCode" />
@@ -123,6 +131,7 @@
       <Member Id="P:Xamarin.Essentials.Connectivity.NetworkAccess" />
     </Type>
     <Type Name="Xamarin.Essentials.ConnectivityChangedEventArgs" Id="T:Xamarin.Essentials.ConnectivityChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.ConnectivityChangedEventArgs.#ctor(Xamarin.Essentials.NetworkAccess,System.Collections.Generic.IEnumerable{Xamarin.Essentials.ConnectionProfile})" />
       <Member Id="M:Xamarin.Essentials.ConnectivityChangedEventArgs.ToString" />
       <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.ConnectionProfiles" />
       <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.NetworkAccess" />
@@ -233,6 +242,7 @@
       <Member Id="F:Xamarin.Essentials.EnergySaverStatus.Unknown" />
     </Type>
     <Type Name="Xamarin.Essentials.EnergySaverStatusChangedEventArgs" Id="T:Xamarin.Essentials.EnergySaverStatusChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.EnergySaverStatusChangedEventArgs.#ctor(Xamarin.Essentials.EnergySaverStatus)" />
       <Member Id="M:Xamarin.Essentials.EnergySaverStatusChangedEventArgs.ToString" />
       <Member Id="P:Xamarin.Essentials.EnergySaverStatusChangedEventArgs.EnergySaverStatus" />
     </Type>
@@ -289,9 +299,12 @@
       <Member Id="P:Xamarin.Essentials.Gyroscope.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.GyroscopeChangedEventArgs" Id="T:Xamarin.Essentials.GyroscopeChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.GyroscopeChangedEventArgs.#ctor(Xamarin.Essentials.GyroscopeData)" />
       <Member Id="P:Xamarin.Essentials.GyroscopeChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.GyroscopeData" Id="T:Xamarin.Essentials.GyroscopeData">
+      <Member Id="M:Xamarin.Essentials.GyroscopeData.#ctor(System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.GyroscopeData.#ctor(System.Single,System.Single,System.Single)" />
       <Member Id="M:Xamarin.Essentials.GyroscopeData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.GyroscopeData.Equals(Xamarin.Essentials.GyroscopeData)" />
       <Member Id="M:Xamarin.Essentials.GyroscopeData.GetHashCode" />
@@ -321,8 +334,6 @@
       <Member Id="M:Xamarin.Essentials.Location.CalculateDistance(System.Double,System.Double,Xamarin.Essentials.Location,Xamarin.Essentials.DistanceUnits)" />
       <Member Id="M:Xamarin.Essentials.Location.CalculateDistance(Xamarin.Essentials.Location,System.Double,System.Double,Xamarin.Essentials.DistanceUnits)" />
       <Member Id="M:Xamarin.Essentials.Location.CalculateDistance(Xamarin.Essentials.Location,Xamarin.Essentials.Location,Xamarin.Essentials.DistanceUnits)" />
-      <Member Id="M:Xamarin.Essentials.Location.KilometersToMiles(System.Double)" />
-      <Member Id="M:Xamarin.Essentials.Location.MilesToKilometers(System.Double)" />
       <Member Id="M:Xamarin.Essentials.Location.ToString" />
       <Member Id="P:Xamarin.Essentials.Location.Accuracy" />
       <Member Id="P:Xamarin.Essentials.Location.Altitude" />
@@ -345,9 +356,12 @@
       <Member Id="P:Xamarin.Essentials.Magnetometer.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.MagnetometerChangedEventArgs" Id="T:Xamarin.Essentials.MagnetometerChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.MagnetometerChangedEventArgs.#ctor(Xamarin.Essentials.MagnetometerData)" />
       <Member Id="P:Xamarin.Essentials.MagnetometerChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.MagnetometerData" Id="T:Xamarin.Essentials.MagnetometerData">
+      <Member Id="M:Xamarin.Essentials.MagnetometerData.#ctor(System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.MagnetometerData.#ctor(System.Single,System.Single,System.Single)" />
       <Member Id="M:Xamarin.Essentials.MagnetometerData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.MagnetometerData.Equals(Xamarin.Essentials.MagnetometerData)" />
       <Member Id="M:Xamarin.Essentials.MagnetometerData.GetHashCode" />
@@ -398,9 +412,12 @@
       <Member Id="P:Xamarin.Essentials.OrientationSensor.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.OrientationSensorChangedEventArgs" Id="T:Xamarin.Essentials.OrientationSensorChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.OrientationSensorChangedEventArgs.#ctor(Xamarin.Essentials.OrientationSensorData)" />
       <Member Id="P:Xamarin.Essentials.OrientationSensorChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.OrientationSensorData" Id="T:Xamarin.Essentials.OrientationSensorData">
+      <Member Id="M:Xamarin.Essentials.OrientationSensorData.#ctor(System.Double,System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.OrientationSensorData.#ctor(System.Single,System.Single,System.Single,System.Single)" />
       <Member Id="M:Xamarin.Essentials.OrientationSensorData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.OrientationSensorData.Equals(Xamarin.Essentials.OrientationSensorData)" />
       <Member Id="M:Xamarin.Essentials.OrientationSensorData.GetHashCode" />
@@ -481,9 +498,9 @@
       <Member Id="M:Xamarin.Essentials.SecureStorage.SetAsync(System.String,System.String)" />
     </Type>
     <Type Name="Xamarin.Essentials.SensorSpeed" Id="T:Xamarin.Essentials.SensorSpeed">
+      <Member Id="F:Xamarin.Essentials.SensorSpeed.Default" />
       <Member Id="F:Xamarin.Essentials.SensorSpeed.Fastest" />
       <Member Id="F:Xamarin.Essentials.SensorSpeed.Game" />
-      <Member Id="F:Xamarin.Essentials.SensorSpeed.Normal" />
       <Member Id="F:Xamarin.Essentials.SensorSpeed.UI" />
     </Type>
     <Type Name="Xamarin.Essentials.Share" Id="T:Xamarin.Essentials.Share">
@@ -521,6 +538,31 @@
       <Member Id="M:Xamarin.Essentials.TextToSpeech.SpeakAsync(System.String,System.Threading.CancellationToken)" />
       <Member Id="M:Xamarin.Essentials.TextToSpeech.SpeakAsync(System.String,Xamarin.Essentials.SpeechOptions,System.Threading.CancellationToken)" />
     </Type>
+    <Type Name="Xamarin.Essentials.UnitConverters" Id="T:Xamarin.Essentials.UnitConverters">
+      <Member Id="M:Xamarin.Essentials.UnitConverters.AtmospheresToPascals(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.CelsiusToFahrenheit(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.CelsiusToKelvin(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.CoordinatesToKilometers(System.Double,System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.CoordinatesToMiles(System.Double,System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.DegreesPerSecondToHertz(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.DegreesPerSecondToRadiansPerSecond(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.DegreesToRadians(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.FahrenheitToCelsius(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.HectopascalsToKilopascals(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.HectopascalsToPascals(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.HertzToDegreesPerSecond(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.HertzToRadiansPerSecond(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.KelvinToCelsius(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.KilometersToMiles(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.KilopascalsToHectopascals(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.KilopascalsToPascals(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.MilesToKilometers(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.MilesToMeters(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.PascalsToAtmospheres(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.RadiansPerSecondToDegreesPerSecond(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.RadiansPerSecondToHertz(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.RadiansToDegrees(System.Double)" />
+    </Type>
     <Type Name="Xamarin.Essentials.VersionTracking" Id="T:Xamarin.Essentials.VersionTracking">
       <Member Id="M:Xamarin.Essentials.VersionTracking.IsFirstLaunchForBuild(System.String)" />
       <Member Id="M:Xamarin.Essentials.VersionTracking.IsFirstLaunchForVersion(System.String)" />
diff --git a/docs/en/FrameworksIndex/xamarin-essentials.xml b/docs/en/FrameworksIndex/xamarin-essentials.xml
index e32b78a0e..1324b9d55 100644
--- a/docs/en/FrameworksIndex/xamarin-essentials.xml
+++ b/docs/en/FrameworksIndex/xamarin-essentials.xml
@@ -10,9 +10,12 @@
       <Member Id="P:Xamarin.Essentials.Accelerometer.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.AccelerometerChangedEventArgs" Id="T:Xamarin.Essentials.AccelerometerChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.AccelerometerChangedEventArgs.#ctor(Xamarin.Essentials.AccelerometerData)" />
       <Member Id="P:Xamarin.Essentials.AccelerometerChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.AccelerometerData" Id="T:Xamarin.Essentials.AccelerometerData">
+      <Member Id="M:Xamarin.Essentials.AccelerometerData.#ctor(System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.AccelerometerData.#ctor(System.Single,System.Single,System.Single)" />
       <Member Id="M:Xamarin.Essentials.AccelerometerData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.AccelerometerData.Equals(Xamarin.Essentials.AccelerometerData)" />
       <Member Id="M:Xamarin.Essentials.AccelerometerData.GetHashCode" />
@@ -36,16 +39,18 @@
       <Member Id="P:Xamarin.Essentials.Barometer.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.BarometerChangedEventArgs" Id="T:Xamarin.Essentials.BarometerChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.BarometerChangedEventArgs.#ctor(Xamarin.Essentials.BarometerData)" />
       <Member Id="P:Xamarin.Essentials.BarometerChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.BarometerData" Id="T:Xamarin.Essentials.BarometerData">
+      <Member Id="M:Xamarin.Essentials.BarometerData.#ctor(System.Double)" />
       <Member Id="M:Xamarin.Essentials.BarometerData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.BarometerData.Equals(Xamarin.Essentials.BarometerData)" />
       <Member Id="M:Xamarin.Essentials.BarometerData.GetHashCode" />
       <Member Id="M:Xamarin.Essentials.BarometerData.op_Equality(Xamarin.Essentials.BarometerData,Xamarin.Essentials.BarometerData)" />
       <Member Id="M:Xamarin.Essentials.BarometerData.op_Inequality(Xamarin.Essentials.BarometerData,Xamarin.Essentials.BarometerData)" />
       <Member Id="M:Xamarin.Essentials.BarometerData.ToString" />
-      <Member Id="P:Xamarin.Essentials.BarometerData.Pressure" />
+      <Member Id="P:Xamarin.Essentials.BarometerData.PressureInHectopascals" />
     </Type>
     <Type Name="Xamarin.Essentials.Battery" Id="T:Xamarin.Essentials.Battery">
       <Member Id="E:Xamarin.Essentials.Battery.BatteryChanged" />
@@ -56,6 +61,7 @@
       <Member Id="P:Xamarin.Essentials.Battery.State" />
     </Type>
     <Type Name="Xamarin.Essentials.BatteryChangedEventArgs" Id="T:Xamarin.Essentials.BatteryChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.BatteryChangedEventArgs.#ctor(System.Double,Xamarin.Essentials.BatteryState,Xamarin.Essentials.BatteryPowerSource)" />
       <Member Id="M:Xamarin.Essentials.BatteryChangedEventArgs.ToString" />
       <Member Id="P:Xamarin.Essentials.BatteryChangedEventArgs.ChargeLevel" />
       <Member Id="P:Xamarin.Essentials.BatteryChangedEventArgs.PowerSource" />
@@ -94,14 +100,16 @@
     <Type Name="Xamarin.Essentials.Compass" Id="T:Xamarin.Essentials.Compass">
       <Member Id="E:Xamarin.Essentials.Compass.ReadingChanged" />
       <Member Id="M:Xamarin.Essentials.Compass.Start(Xamarin.Essentials.SensorSpeed)" />
+      <Member Id="M:Xamarin.Essentials.Compass.Start(Xamarin.Essentials.SensorSpeed,System.Boolean)" />
       <Member Id="M:Xamarin.Essentials.Compass.Stop" />
-      <Member Id="P:Xamarin.Essentials.Compass.ApplyLowPassFilter" />
       <Member Id="P:Xamarin.Essentials.Compass.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.CompassChangedEventArgs" Id="T:Xamarin.Essentials.CompassChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.CompassChangedEventArgs.#ctor(Xamarin.Essentials.CompassData)" />
       <Member Id="P:Xamarin.Essentials.CompassChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.CompassData" Id="T:Xamarin.Essentials.CompassData">
+      <Member Id="M:Xamarin.Essentials.CompassData.#ctor(System.Double)" />
       <Member Id="M:Xamarin.Essentials.CompassData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.CompassData.Equals(Xamarin.Essentials.CompassData)" />
       <Member Id="M:Xamarin.Essentials.CompassData.GetHashCode" />
@@ -123,6 +131,7 @@
       <Member Id="P:Xamarin.Essentials.Connectivity.NetworkAccess" />
     </Type>
     <Type Name="Xamarin.Essentials.ConnectivityChangedEventArgs" Id="T:Xamarin.Essentials.ConnectivityChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.ConnectivityChangedEventArgs.#ctor(Xamarin.Essentials.NetworkAccess,System.Collections.Generic.IEnumerable{Xamarin.Essentials.ConnectionProfile})" />
       <Member Id="M:Xamarin.Essentials.ConnectivityChangedEventArgs.ToString" />
       <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.ConnectionProfiles" />
       <Member Id="P:Xamarin.Essentials.ConnectivityChangedEventArgs.NetworkAccess" />
@@ -233,6 +242,7 @@
       <Member Id="F:Xamarin.Essentials.EnergySaverStatus.Unknown" />
     </Type>
     <Type Name="Xamarin.Essentials.EnergySaverStatusChangedEventArgs" Id="T:Xamarin.Essentials.EnergySaverStatusChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.EnergySaverStatusChangedEventArgs.#ctor(Xamarin.Essentials.EnergySaverStatus)" />
       <Member Id="M:Xamarin.Essentials.EnergySaverStatusChangedEventArgs.ToString" />
       <Member Id="P:Xamarin.Essentials.EnergySaverStatusChangedEventArgs.EnergySaverStatus" />
     </Type>
@@ -289,9 +299,12 @@
       <Member Id="P:Xamarin.Essentials.Gyroscope.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.GyroscopeChangedEventArgs" Id="T:Xamarin.Essentials.GyroscopeChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.GyroscopeChangedEventArgs.#ctor(Xamarin.Essentials.GyroscopeData)" />
       <Member Id="P:Xamarin.Essentials.GyroscopeChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.GyroscopeData" Id="T:Xamarin.Essentials.GyroscopeData">
+      <Member Id="M:Xamarin.Essentials.GyroscopeData.#ctor(System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.GyroscopeData.#ctor(System.Single,System.Single,System.Single)" />
       <Member Id="M:Xamarin.Essentials.GyroscopeData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.GyroscopeData.Equals(Xamarin.Essentials.GyroscopeData)" />
       <Member Id="M:Xamarin.Essentials.GyroscopeData.GetHashCode" />
@@ -321,8 +334,6 @@
       <Member Id="M:Xamarin.Essentials.Location.CalculateDistance(System.Double,System.Double,Xamarin.Essentials.Location,Xamarin.Essentials.DistanceUnits)" />
       <Member Id="M:Xamarin.Essentials.Location.CalculateDistance(Xamarin.Essentials.Location,System.Double,System.Double,Xamarin.Essentials.DistanceUnits)" />
       <Member Id="M:Xamarin.Essentials.Location.CalculateDistance(Xamarin.Essentials.Location,Xamarin.Essentials.Location,Xamarin.Essentials.DistanceUnits)" />
-      <Member Id="M:Xamarin.Essentials.Location.KilometersToMiles(System.Double)" />
-      <Member Id="M:Xamarin.Essentials.Location.MilesToKilometers(System.Double)" />
       <Member Id="M:Xamarin.Essentials.Location.ToString" />
       <Member Id="P:Xamarin.Essentials.Location.Accuracy" />
       <Member Id="P:Xamarin.Essentials.Location.Altitude" />
@@ -345,9 +356,12 @@
       <Member Id="P:Xamarin.Essentials.Magnetometer.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.MagnetometerChangedEventArgs" Id="T:Xamarin.Essentials.MagnetometerChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.MagnetometerChangedEventArgs.#ctor(Xamarin.Essentials.MagnetometerData)" />
       <Member Id="P:Xamarin.Essentials.MagnetometerChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.MagnetometerData" Id="T:Xamarin.Essentials.MagnetometerData">
+      <Member Id="M:Xamarin.Essentials.MagnetometerData.#ctor(System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.MagnetometerData.#ctor(System.Single,System.Single,System.Single)" />
       <Member Id="M:Xamarin.Essentials.MagnetometerData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.MagnetometerData.Equals(Xamarin.Essentials.MagnetometerData)" />
       <Member Id="M:Xamarin.Essentials.MagnetometerData.GetHashCode" />
@@ -398,9 +412,12 @@
       <Member Id="P:Xamarin.Essentials.OrientationSensor.IsMonitoring" />
     </Type>
     <Type Name="Xamarin.Essentials.OrientationSensorChangedEventArgs" Id="T:Xamarin.Essentials.OrientationSensorChangedEventArgs">
+      <Member Id="M:Xamarin.Essentials.OrientationSensorChangedEventArgs.#ctor(Xamarin.Essentials.OrientationSensorData)" />
       <Member Id="P:Xamarin.Essentials.OrientationSensorChangedEventArgs.Reading" />
     </Type>
     <Type Name="Xamarin.Essentials.OrientationSensorData" Id="T:Xamarin.Essentials.OrientationSensorData">
+      <Member Id="M:Xamarin.Essentials.OrientationSensorData.#ctor(System.Double,System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.OrientationSensorData.#ctor(System.Single,System.Single,System.Single,System.Single)" />
       <Member Id="M:Xamarin.Essentials.OrientationSensorData.Equals(System.Object)" />
       <Member Id="M:Xamarin.Essentials.OrientationSensorData.Equals(Xamarin.Essentials.OrientationSensorData)" />
       <Member Id="M:Xamarin.Essentials.OrientationSensorData.GetHashCode" />
@@ -478,9 +495,9 @@
       <Member Id="M:Xamarin.Essentials.SecureStorage.SetAsync(System.String,System.String)" />
     </Type>
     <Type Name="Xamarin.Essentials.SensorSpeed" Id="T:Xamarin.Essentials.SensorSpeed">
+      <Member Id="F:Xamarin.Essentials.SensorSpeed.Default" />
       <Member Id="F:Xamarin.Essentials.SensorSpeed.Fastest" />
       <Member Id="F:Xamarin.Essentials.SensorSpeed.Game" />
-      <Member Id="F:Xamarin.Essentials.SensorSpeed.Normal" />
       <Member Id="F:Xamarin.Essentials.SensorSpeed.UI" />
     </Type>
     <Type Name="Xamarin.Essentials.Share" Id="T:Xamarin.Essentials.Share">
@@ -518,6 +535,31 @@
       <Member Id="M:Xamarin.Essentials.TextToSpeech.SpeakAsync(System.String,System.Threading.CancellationToken)" />
       <Member Id="M:Xamarin.Essentials.TextToSpeech.SpeakAsync(System.String,Xamarin.Essentials.SpeechOptions,System.Threading.CancellationToken)" />
     </Type>
+    <Type Name="Xamarin.Essentials.UnitConverters" Id="T:Xamarin.Essentials.UnitConverters">
+      <Member Id="M:Xamarin.Essentials.UnitConverters.AtmospheresToPascals(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.CelsiusToFahrenheit(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.CelsiusToKelvin(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.CoordinatesToKilometers(System.Double,System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.CoordinatesToMiles(System.Double,System.Double,System.Double,System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.DegreesPerSecondToHertz(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.DegreesPerSecondToRadiansPerSecond(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.DegreesToRadians(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.FahrenheitToCelsius(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.HectopascalsToKilopascals(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.HectopascalsToPascals(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.HertzToDegreesPerSecond(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.HertzToRadiansPerSecond(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.KelvinToCelsius(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.KilometersToMiles(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.KilopascalsToHectopascals(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.KilopascalsToPascals(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.MilesToKilometers(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.MilesToMeters(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.PascalsToAtmospheres(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.RadiansPerSecondToDegreesPerSecond(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.RadiansPerSecondToHertz(System.Double)" />
+      <Member Id="M:Xamarin.Essentials.UnitConverters.RadiansToDegrees(System.Double)" />
+    </Type>
     <Type Name="Xamarin.Essentials.VersionTracking" Id="T:Xamarin.Essentials.VersionTracking">
       <Member Id="M:Xamarin.Essentials.VersionTracking.IsFirstLaunchForBuild(System.String)" />
       <Member Id="M:Xamarin.Essentials.VersionTracking.IsFirstLaunchForVersion(System.String)" />
diff --git a/docs/en/Xamarin.Essentials/AccelerometerChangedEventArgs.xml b/docs/en/Xamarin.Essentials/AccelerometerChangedEventArgs.xml
index 0e0c17320..edd5c78dc 100644
--- a/docs/en/Xamarin.Essentials/AccelerometerChangedEventArgs.xml
+++ b/docs/en/Xamarin.Essentials/AccelerometerChangedEventArgs.xml
@@ -15,6 +15,24 @@
     <remarks></remarks>
   </Docs>
   <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public AccelerometerChangedEventArgs (Xamarin.Essentials.AccelerometerData reading);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(valuetype Xamarin.Essentials.AccelerometerData reading) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.AccelerometerChangedEventArgs.#ctor(Xamarin.Essentials.AccelerometerData)" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters>
+        <Parameter Name="reading" Type="Xamarin.Essentials.AccelerometerData" />
+      </Parameters>
+      <Docs>
+        <param name="reading">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Reading">
       <MemberSignature Language="C#" Value="public Xamarin.Essentials.AccelerometerData Reading { get; }" />
       <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Essentials.AccelerometerData Reading" />
diff --git a/docs/en/Xamarin.Essentials/AccelerometerData.xml b/docs/en/Xamarin.Essentials/AccelerometerData.xml
index 55cf2de65..ef6b59b01 100644
--- a/docs/en/Xamarin.Essentials/AccelerometerData.xml
+++ b/docs/en/Xamarin.Essentials/AccelerometerData.xml
@@ -24,6 +24,50 @@
     <remarks></remarks>
   </Docs>
   <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public AccelerometerData (double x, double y, double z);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(float64 x, float64 y, float64 z) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.AccelerometerData.#ctor(System.Double,System.Double,System.Double)" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters>
+        <Parameter Name="x" Type="System.Double" />
+        <Parameter Name="y" Type="System.Double" />
+        <Parameter Name="z" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="x">To be added.</param>
+        <param name="y">To be added.</param>
+        <param name="z">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public AccelerometerData (float x, float y, float z);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(float32 x, float32 y, float32 z) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.AccelerometerData.#ctor(System.Single,System.Single,System.Single)" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters>
+        <Parameter Name="x" Type="System.Single" />
+        <Parameter Name="y" Type="System.Single" />
+        <Parameter Name="z" Type="System.Single" />
+      </Parameters>
+      <Docs>
+        <param name="x">To be added.</param>
+        <param name="y">To be added.</param>
+        <param name="z">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Acceleration">
       <MemberSignature Language="C#" Value="public System.Numerics.Vector3 Acceleration { get; }" />
       <MemberSignature Language="ILAsm" Value=".property instance valuetype System.Numerics.Vector3 Acceleration" />
diff --git a/docs/en/Xamarin.Essentials/BarometerChangedEventArgs.xml b/docs/en/Xamarin.Essentials/BarometerChangedEventArgs.xml
index 57e080765..2b013f47b 100644
--- a/docs/en/Xamarin.Essentials/BarometerChangedEventArgs.xml
+++ b/docs/en/Xamarin.Essentials/BarometerChangedEventArgs.xml
@@ -15,6 +15,24 @@
     <remarks></remarks>
   </Docs>
   <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public BarometerChangedEventArgs (Xamarin.Essentials.BarometerData reading);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(valuetype Xamarin.Essentials.BarometerData reading) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.BarometerChangedEventArgs.#ctor(Xamarin.Essentials.BarometerData)" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters>
+        <Parameter Name="reading" Type="Xamarin.Essentials.BarometerData" />
+      </Parameters>
+      <Docs>
+        <param name="reading">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="BarometerData">
       <MemberSignature Language="C#" Value="public Xamarin.Essentials.BarometerData Reading { get; }" />
       <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Essentials.BarometerData Reading" />
diff --git a/docs/en/Xamarin.Essentials/BarometerData.xml b/docs/en/Xamarin.Essentials/BarometerData.xml
index c874d2296..8fba5a779 100644
--- a/docs/en/Xamarin.Essentials/BarometerData.xml
+++ b/docs/en/Xamarin.Essentials/BarometerData.xml
@@ -26,6 +26,24 @@
     <remarks></remarks>
   </Docs>
   <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public BarometerData (double pressure);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(float64 pressure) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.BarometerData.#ctor(System.Double)" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters>
+        <Parameter Name="pressure" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="pressure">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Equals">
       <MemberSignature Language="C#" Value="public override bool Equals (object obj);" />
       <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance bool Equals(object obj) cil managed" />
@@ -144,10 +162,10 @@
         <remarks></remarks>
       </Docs>
     </Member>
-    <Member MemberName="Pressure">
-      <MemberSignature Language="C#" Value="public double Pressure { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance float64 Pressure" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.BarometerData.Pressure" />
+    <Member MemberName="PressureInHectopascals">
+      <MemberSignature Language="C#" Value="public double PressureInHectopascals { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance float64 PressureInHectopascals" />
+      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.BarometerData.PressureInHectopascals" />
       <MemberType>Property</MemberType>
       <AssemblyInfo>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
@@ -157,9 +175,9 @@
         <ReturnType>System.Double</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Pressure in hPA</summary>
-        <value>The pressure</value>
-        <remarks></remarks>
+        <summary>To be added.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
       </Docs>
     </Member>
     <Member MemberName="ToString">
diff --git a/docs/en/Xamarin.Essentials/BatteryChangedEventArgs.xml b/docs/en/Xamarin.Essentials/BatteryChangedEventArgs.xml
index 4da1c42d3..0ebcd8eb5 100644
--- a/docs/en/Xamarin.Essentials/BatteryChangedEventArgs.xml
+++ b/docs/en/Xamarin.Essentials/BatteryChangedEventArgs.xml
@@ -15,6 +15,28 @@
     <remarks>Returns the current information of the battery.</remarks>
   </Docs>
   <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public BatteryChangedEventArgs (double level, Xamarin.Essentials.BatteryState state, Xamarin.Essentials.BatteryPowerSource source);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(float64 level, valuetype Xamarin.Essentials.BatteryState state, valuetype Xamarin.Essentials.BatteryPowerSource source) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.BatteryChangedEventArgs.#ctor(System.Double,Xamarin.Essentials.BatteryState,Xamarin.Essentials.BatteryPowerSource)" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters>
+        <Parameter Name="level" Type="System.Double" />
+        <Parameter Name="state" Type="Xamarin.Essentials.BatteryState" />
+        <Parameter Name="source" Type="Xamarin.Essentials.BatteryPowerSource" />
+      </Parameters>
+      <Docs>
+        <param name="level">To be added.</param>
+        <param name="state">To be added.</param>
+        <param name="source">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="ChargeLevel">
       <MemberSignature Language="C#" Value="public double ChargeLevel { get; }" />
       <MemberSignature Language="ILAsm" Value=".property instance float64 ChargeLevel" />
diff --git a/docs/en/Xamarin.Essentials/Compass.xml b/docs/en/Xamarin.Essentials/Compass.xml
index bf56da15a..799a6d4c6 100644
--- a/docs/en/Xamarin.Essentials/Compass.xml
+++ b/docs/en/Xamarin.Essentials/Compass.xml
@@ -15,24 +15,6 @@
     <remarks></remarks>
   </Docs>
   <Members>
-    <Member MemberName="ApplyLowPassFilter">
-      <MemberSignature Language="C#" Value="public static bool ApplyLowPassFilter { get; set; }" />
-      <MemberSignature Language="ILAsm" Value=".property bool ApplyLowPassFilter" />
-      <MemberSignature Language="DocId" Value="P:Xamarin.Essentials.Compass.ApplyLowPassFilter" />
-      <MemberType>Property</MemberType>
-      <AssemblyInfo>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Docs>
-        <summary>Applies a moving average filter on the Android implementation. Unused on other platforms</summary>
-        <value>If a low pass filter is applied</value>
-        <remarks></remarks>
-      </Docs>
-    </Member>
     <Member MemberName="IsMonitoring">
       <MemberSignature Language="C#" Value="public static bool IsMonitoring { get; }" />
       <MemberSignature Language="ILAsm" Value=".property bool IsMonitoring" />
@@ -109,6 +91,29 @@
         <remarks>Will throw FeatureNotSupportedException if not supported on device. Will throw ArgumentNullException if handler is null.</remarks>
       </Docs>
     </Member>
+    <Member MemberName="Start">
+      <MemberSignature Language="C#" Value="public static void Start (Xamarin.Essentials.SensorSpeed sensorSpeed, bool applyLowPassFilter);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig void Start(valuetype Xamarin.Essentials.SensorSpeed sensorSpeed, bool applyLowPassFilter) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Compass.Start(Xamarin.Essentials.SensorSpeed,System.Boolean)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="sensorSpeed" Type="Xamarin.Essentials.SensorSpeed" />
+        <Parameter Name="applyLowPassFilter" Type="System.Boolean" />
+      </Parameters>
+      <Docs>
+        <param name="sensorSpeed">The speed to monitor for changes.</param>
+        <param name="applyLowPassFilter">Whether or not to apply a moving average filter (only used on Android).</param>
+        <summary>Start monitoring for changes to the compass.</summary>
+        <remarks>Will throw FeatureNotSupportedException if not supported on device. Will throw ArgumentNullException if handler is null.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Stop">
       <MemberSignature Language="C#" Value="public static void Stop ();" />
       <MemberSignature Language="ILAsm" Value=".method public static hidebysig void Stop() cil managed" />
diff --git a/docs/en/Xamarin.Essentials/CompassChangedEventArgs.xml b/docs/en/Xamarin.Essentials/CompassChangedEventArgs.xml
index b09aad163..529a4e42f 100644
--- a/docs/en/Xamarin.Essentials/CompassChangedEventArgs.xml
+++ b/docs/en/Xamarin.Essentials/CompassChangedEventArgs.xml
@@ -17,6 +17,24 @@
     </remarks>
   </Docs>
   <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public CompassChangedEventArgs (Xamarin.Essentials.CompassData reading);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(valuetype Xamarin.Essentials.CompassData reading) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.CompassChangedEventArgs.#ctor(Xamarin.Essentials.CompassData)" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters>
+        <Parameter Name="reading" Type="Xamarin.Essentials.CompassData" />
+      </Parameters>
+      <Docs>
+        <param name="reading">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Reading">
       <MemberSignature Language="C#" Value="public Xamarin.Essentials.CompassData Reading { get; }" />
       <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Essentials.CompassData Reading" />
diff --git a/docs/en/Xamarin.Essentials/CompassData.xml b/docs/en/Xamarin.Essentials/CompassData.xml
index 3c52ba371..8b4ac0989 100644
--- a/docs/en/Xamarin.Essentials/CompassData.xml
+++ b/docs/en/Xamarin.Essentials/CompassData.xml
@@ -26,6 +26,24 @@
     <remarks></remarks>
   </Docs>
   <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public CompassData (double headingMagneticNorth);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(float64 headingMagneticNorth) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.CompassData.#ctor(System.Double)" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters>
+        <Parameter Name="headingMagneticNorth" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="headingMagneticNorth">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Equals">
       <MemberSignature Language="C#" Value="public override bool Equals (object obj);" />
       <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance bool Equals(object obj) cil managed" />
diff --git a/docs/en/Xamarin.Essentials/ConnectivityChangedEventArgs.xml b/docs/en/Xamarin.Essentials/ConnectivityChangedEventArgs.xml
index 939eb7224..6be16e934 100644
--- a/docs/en/Xamarin.Essentials/ConnectivityChangedEventArgs.xml
+++ b/docs/en/Xamarin.Essentials/ConnectivityChangedEventArgs.xml
@@ -17,6 +17,26 @@
     </remarks>
   </Docs>
   <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public ConnectivityChangedEventArgs (Xamarin.Essentials.NetworkAccess access, System.Collections.Generic.IEnumerable&lt;Xamarin.Essentials.ConnectionProfile&gt; connectionProfiles);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(valuetype Xamarin.Essentials.NetworkAccess access, class System.Collections.Generic.IEnumerable`1&lt;valuetype Xamarin.Essentials.ConnectionProfile&gt; connectionProfiles) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.ConnectivityChangedEventArgs.#ctor(Xamarin.Essentials.NetworkAccess,System.Collections.Generic.IEnumerable{Xamarin.Essentials.ConnectionProfile})" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters>
+        <Parameter Name="access" Type="Xamarin.Essentials.NetworkAccess" />
+        <Parameter Name="connectionProfiles" Type="System.Collections.Generic.IEnumerable&lt;Xamarin.Essentials.ConnectionProfile&gt;" />
+      </Parameters>
+      <Docs>
+        <param name="access">To be added.</param>
+        <param name="connectionProfiles">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="ConnectionProfiles">
       <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;Xamarin.Essentials.ConnectionProfile&gt; ConnectionProfiles { get; }" />
       <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;valuetype Xamarin.Essentials.ConnectionProfile&gt; ConnectionProfiles" />
diff --git a/docs/en/Xamarin.Essentials/EnergySaverStatusChangedEventArgs.xml b/docs/en/Xamarin.Essentials/EnergySaverStatusChangedEventArgs.xml
index 2ac6b4b32..a01b7a0e5 100644
--- a/docs/en/Xamarin.Essentials/EnergySaverStatusChangedEventArgs.xml
+++ b/docs/en/Xamarin.Essentials/EnergySaverStatusChangedEventArgs.xml
@@ -15,6 +15,24 @@
     <remarks>To be added.</remarks>
   </Docs>
   <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public EnergySaverStatusChangedEventArgs (Xamarin.Essentials.EnergySaverStatus saverStatus);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(valuetype Xamarin.Essentials.EnergySaverStatus saverStatus) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.EnergySaverStatusChangedEventArgs.#ctor(Xamarin.Essentials.EnergySaverStatus)" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters>
+        <Parameter Name="saverStatus" Type="Xamarin.Essentials.EnergySaverStatus" />
+      </Parameters>
+      <Docs>
+        <param name="saverStatus">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="EnergySaverStatus">
       <MemberSignature Language="C#" Value="public Xamarin.Essentials.EnergySaverStatus EnergySaverStatus { get; }" />
       <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Essentials.EnergySaverStatus EnergySaverStatus" />
diff --git a/docs/en/Xamarin.Essentials/GyroscopeChangedEventArgs.xml b/docs/en/Xamarin.Essentials/GyroscopeChangedEventArgs.xml
index 4ce7259f5..c3bca848a 100644
--- a/docs/en/Xamarin.Essentials/GyroscopeChangedEventArgs.xml
+++ b/docs/en/Xamarin.Essentials/GyroscopeChangedEventArgs.xml
@@ -15,6 +15,24 @@
     <remarks></remarks>
   </Docs>
   <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public GyroscopeChangedEventArgs (Xamarin.Essentials.GyroscopeData reading);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(valuetype Xamarin.Essentials.GyroscopeData reading) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.GyroscopeChangedEventArgs.#ctor(Xamarin.Essentials.GyroscopeData)" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters>
+        <Parameter Name="reading" Type="Xamarin.Essentials.GyroscopeData" />
+      </Parameters>
+      <Docs>
+        <param name="reading">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Reading">
       <MemberSignature Language="C#" Value="public Xamarin.Essentials.GyroscopeData Reading { get; }" />
       <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Essentials.GyroscopeData Reading" />
diff --git a/docs/en/Xamarin.Essentials/GyroscopeData.xml b/docs/en/Xamarin.Essentials/GyroscopeData.xml
index 34c9bd208..9fc1f3061 100644
--- a/docs/en/Xamarin.Essentials/GyroscopeData.xml
+++ b/docs/en/Xamarin.Essentials/GyroscopeData.xml
@@ -24,6 +24,50 @@
     <remarks></remarks>
   </Docs>
   <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public GyroscopeData (double x, double y, double z);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(float64 x, float64 y, float64 z) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.GyroscopeData.#ctor(System.Double,System.Double,System.Double)" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters>
+        <Parameter Name="x" Type="System.Double" />
+        <Parameter Name="y" Type="System.Double" />
+        <Parameter Name="z" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="x">To be added.</param>
+        <param name="y">To be added.</param>
+        <param name="z">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public GyroscopeData (float x, float y, float z);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(float32 x, float32 y, float32 z) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.GyroscopeData.#ctor(System.Single,System.Single,System.Single)" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters>
+        <Parameter Name="x" Type="System.Single" />
+        <Parameter Name="y" Type="System.Single" />
+        <Parameter Name="z" Type="System.Single" />
+      </Parameters>
+      <Docs>
+        <param name="x">To be added.</param>
+        <param name="y">To be added.</param>
+        <param name="z">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="AngularVelocity">
       <MemberSignature Language="C#" Value="public System.Numerics.Vector3 AngularVelocity { get; }" />
       <MemberSignature Language="ILAsm" Value=".property instance valuetype System.Numerics.Vector3 AngularVelocity" />
@@ -37,7 +81,7 @@
         <ReturnType>System.Numerics.Vector3</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Gets the angular velocity vector in rad/s.</summary>
+        <summary>Gets the angular velocity vector in radians per second.</summary>
         <value></value>
         <remarks></remarks>
       </Docs>
diff --git a/docs/en/Xamarin.Essentials/Location.xml b/docs/en/Xamarin.Essentials/Location.xml
index c2b6232f7..a58457031 100644
--- a/docs/en/Xamarin.Essentials/Location.xml
+++ b/docs/en/Xamarin.Essentials/Location.xml
@@ -209,8 +209,8 @@
       </Docs>
     </Member>
     <Member MemberName="CalculateDistance">
-      <MemberSignature Language="C#" Value="public static double CalculateDistance (double latitudeStart, double latitudeEnd, double longitudeStart, double longitudeEnd, Xamarin.Essentials.DistanceUnits units);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 CalculateDistance(float64 latitudeStart, float64 latitudeEnd, float64 longitudeStart, float64 longitudeEnd, valuetype Xamarin.Essentials.DistanceUnits units) cil managed" />
+      <MemberSignature Language="C#" Value="public static double CalculateDistance (double latitudeStart, double longitudeStart, double latitudeEnd, double longitudeEnd, Xamarin.Essentials.DistanceUnits units);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 CalculateDistance(float64 latitudeStart, float64 longitudeStart, float64 latitudeEnd, float64 longitudeEnd, valuetype Xamarin.Essentials.DistanceUnits units) cil managed" />
       <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Location.CalculateDistance(System.Double,System.Double,System.Double,System.Double,Xamarin.Essentials.DistanceUnits)" />
       <MemberType>Method</MemberType>
       <AssemblyInfo>
@@ -258,30 +258,6 @@
         </remarks>
       </Docs>
     </Member>
-    <Member MemberName="KilometersToMiles">
-      <MemberSignature Language="C#" Value="public static double KilometersToMiles (double kilometers);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 KilometersToMiles(float64 kilometers) cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Location.KilometersToMiles(System.Double)" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="kilometers" Type="System.Double" />
-      </Parameters>
-      <Docs>
-        <param name="kilometers">
-          <para>Kilometers to convert to miles.</para>
-        </param>
-        <summary>Convert kilometers to miles.</summary>
-        <returns>Miles conversion from kilometers.</returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
     <Member MemberName="Latitude">
       <MemberSignature Language="C#" Value="public double Latitude { get; set; }" />
       <MemberSignature Language="ILAsm" Value=".property instance float64 Latitude" />
@@ -318,28 +294,6 @@
         <remarks></remarks>
       </Docs>
     </Member>
-    <Member MemberName="MilesToKilometers">
-      <MemberSignature Language="C#" Value="public static double MilesToKilometers (double miles);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 MilesToKilometers(float64 miles) cil managed" />
-      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.Location.MilesToKilometers(System.Double)" />
-      <MemberType>Method</MemberType>
-      <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
-        <AssemblyName>Xamarin.Essentials</AssemblyName>
-      </AssemblyInfo>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="miles" Type="System.Double" />
-      </Parameters>
-      <Docs>
-        <param name="miles">Miles to be converted.</param>
-        <summary>Converts miles to kilometers.</summary>
-        <returns>Value of miles converted to kilometers.</returns>
-        <remarks></remarks>
-      </Docs>
-    </Member>
     <Member MemberName="Speed">
       <MemberSignature Language="C#" Value="public Nullable&lt;double&gt; Speed { get; set; }" />
       <MemberSignature Language="ILAsm" Value=".property instance valuetype System.Nullable`1&lt;float64&gt; Speed" />
diff --git a/docs/en/Xamarin.Essentials/Magnetometer.xml b/docs/en/Xamarin.Essentials/Magnetometer.xml
index 6a277f474..0142cbef5 100644
--- a/docs/en/Xamarin.Essentials/Magnetometer.xml
+++ b/docs/en/Xamarin.Essentials/Magnetometer.xml
@@ -11,7 +11,7 @@
   </Base>
   <Interfaces />
   <Docs>
-    <summary>Detect device's orentation relative to Earth's magnetic field.</summary>
+    <summary>Detect device's orentation relative to Earth's magnetic field in microteslas (µ).</summary>
     <remarks></remarks>
   </Docs>
   <Members>
diff --git a/docs/en/Xamarin.Essentials/MagnetometerChangedEventArgs.xml b/docs/en/Xamarin.Essentials/MagnetometerChangedEventArgs.xml
index 194837ef9..6e72867aa 100644
--- a/docs/en/Xamarin.Essentials/MagnetometerChangedEventArgs.xml
+++ b/docs/en/Xamarin.Essentials/MagnetometerChangedEventArgs.xml
@@ -15,6 +15,24 @@
     <remarks></remarks>
   </Docs>
   <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public MagnetometerChangedEventArgs (Xamarin.Essentials.MagnetometerData reading);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(valuetype Xamarin.Essentials.MagnetometerData reading) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.MagnetometerChangedEventArgs.#ctor(Xamarin.Essentials.MagnetometerData)" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters>
+        <Parameter Name="reading" Type="Xamarin.Essentials.MagnetometerData" />
+      </Parameters>
+      <Docs>
+        <param name="reading">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Reading">
       <MemberSignature Language="C#" Value="public Xamarin.Essentials.MagnetometerData Reading { get; }" />
       <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Essentials.MagnetometerData Reading" />
diff --git a/docs/en/Xamarin.Essentials/MagnetometerData.xml b/docs/en/Xamarin.Essentials/MagnetometerData.xml
index d214df114..bb84c5c82 100644
--- a/docs/en/Xamarin.Essentials/MagnetometerData.xml
+++ b/docs/en/Xamarin.Essentials/MagnetometerData.xml
@@ -24,6 +24,50 @@
     <remarks></remarks>
   </Docs>
   <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public MagnetometerData (double x, double y, double z);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(float64 x, float64 y, float64 z) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.MagnetometerData.#ctor(System.Double,System.Double,System.Double)" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters>
+        <Parameter Name="x" Type="System.Double" />
+        <Parameter Name="y" Type="System.Double" />
+        <Parameter Name="z" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="x">To be added.</param>
+        <param name="y">To be added.</param>
+        <param name="z">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public MagnetometerData (float x, float y, float z);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(float32 x, float32 y, float32 z) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.MagnetometerData.#ctor(System.Single,System.Single,System.Single)" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters>
+        <Parameter Name="x" Type="System.Single" />
+        <Parameter Name="y" Type="System.Single" />
+        <Parameter Name="z" Type="System.Single" />
+      </Parameters>
+      <Docs>
+        <param name="x">To be added.</param>
+        <param name="y">To be added.</param>
+        <param name="z">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Equals">
       <MemberSignature Language="C#" Value="public override bool Equals (object obj);" />
       <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance bool Equals(object obj) cil managed" />
@@ -109,7 +153,7 @@
         <ReturnType>System.Numerics.Vector3</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>Gets the magnetic field vector in microteslas.</summary>
+        <summary>Gets the magnetic field vector in microteslas (µ).</summary>
         <value></value>
         <remarks></remarks>
       </Docs>
diff --git a/docs/en/Xamarin.Essentials/OrientationSensorChangedEventArgs.xml b/docs/en/Xamarin.Essentials/OrientationSensorChangedEventArgs.xml
index e04e8a9fe..9c5b5ac8d 100644
--- a/docs/en/Xamarin.Essentials/OrientationSensorChangedEventArgs.xml
+++ b/docs/en/Xamarin.Essentials/OrientationSensorChangedEventArgs.xml
@@ -15,6 +15,24 @@
     <remarks></remarks>
   </Docs>
   <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public OrientationSensorChangedEventArgs (Xamarin.Essentials.OrientationSensorData reading);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(valuetype Xamarin.Essentials.OrientationSensorData reading) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.OrientationSensorChangedEventArgs.#ctor(Xamarin.Essentials.OrientationSensorData)" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters>
+        <Parameter Name="reading" Type="Xamarin.Essentials.OrientationSensorData" />
+      </Parameters>
+      <Docs>
+        <param name="reading">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Reading">
       <MemberSignature Language="C#" Value="public Xamarin.Essentials.OrientationSensorData Reading { get; }" />
       <MemberSignature Language="ILAsm" Value=".property instance valuetype Xamarin.Essentials.OrientationSensorData Reading" />
diff --git a/docs/en/Xamarin.Essentials/OrientationSensorData.xml b/docs/en/Xamarin.Essentials/OrientationSensorData.xml
index 056bde1f7..ad5cca0ac 100644
--- a/docs/en/Xamarin.Essentials/OrientationSensorData.xml
+++ b/docs/en/Xamarin.Essentials/OrientationSensorData.xml
@@ -26,6 +26,54 @@
     </remarks>
   </Docs>
   <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public OrientationSensorData (double x, double y, double z, double w);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(float64 x, float64 y, float64 z, float64 w) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.OrientationSensorData.#ctor(System.Double,System.Double,System.Double,System.Double)" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters>
+        <Parameter Name="x" Type="System.Double" />
+        <Parameter Name="y" Type="System.Double" />
+        <Parameter Name="z" Type="System.Double" />
+        <Parameter Name="w" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="x">To be added.</param>
+        <param name="y">To be added.</param>
+        <param name="z">To be added.</param>
+        <param name="w">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public OrientationSensorData (float x, float y, float z, float w);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(float32 x, float32 y, float32 z, float32 w) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.OrientationSensorData.#ctor(System.Single,System.Single,System.Single,System.Single)" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters>
+        <Parameter Name="x" Type="System.Single" />
+        <Parameter Name="y" Type="System.Single" />
+        <Parameter Name="z" Type="System.Single" />
+        <Parameter Name="w" Type="System.Single" />
+      </Parameters>
+      <Docs>
+        <param name="x">To be added.</param>
+        <param name="y">To be added.</param>
+        <param name="z">To be added.</param>
+        <param name="w">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Equals">
       <MemberSignature Language="C#" Value="public override bool Equals (object obj);" />
       <MemberSignature Language="ILAsm" Value=".method public hidebysig virtual instance bool Equals(object obj) cil managed" />
diff --git a/docs/en/Xamarin.Essentials/SensorSpeed.xml b/docs/en/Xamarin.Essentials/SensorSpeed.xml
index 8c0417951..8f6fca722 100644
--- a/docs/en/Xamarin.Essentials/SensorSpeed.xml
+++ b/docs/en/Xamarin.Essentials/SensorSpeed.xml
@@ -14,27 +14,27 @@
     <remarks></remarks>
   </Docs>
   <Members>
-    <Member MemberName="Fastest">
-      <MemberSignature Language="C#" Value="Fastest" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.SensorSpeed Fastest = int32(0)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.SensorSpeed.Fastest" />
+    <Member MemberName="Default">
+      <MemberSignature Language="C#" Value="Default" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.SensorSpeed Default = int32(0)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.SensorSpeed.Default" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
-        <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
       </AssemblyInfo>
       <ReturnValue>
         <ReturnType>Xamarin.Essentials.SensorSpeed</ReturnType>
       </ReturnValue>
       <MemberValue>0</MemberValue>
       <Docs>
-        <summary>Get the sensor data as fast as possible.</summary>
+        <summary>To be added.</summary>
       </Docs>
     </Member>
-    <Member MemberName="Game">
-      <MemberSignature Language="C#" Value="Game" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.SensorSpeed Game = int32(1)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.SensorSpeed.Game" />
+    <Member MemberName="Fastest">
+      <MemberSignature Language="C#" Value="Fastest" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.SensorSpeed Fastest = int32(3)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.SensorSpeed.Fastest" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -43,15 +43,15 @@
       <ReturnValue>
         <ReturnType>Xamarin.Essentials.SensorSpeed</ReturnType>
       </ReturnValue>
-      <MemberValue>1</MemberValue>
+      <MemberValue>3</MemberValue>
       <Docs>
-        <summary>Rate suitable for games.</summary>
+        <summary>Get the sensor data as fast as possible.</summary>
       </Docs>
     </Member>
-    <Member MemberName="Normal">
-      <MemberSignature Language="C#" Value="Normal" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.SensorSpeed Normal = int32(3)" />
-      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.SensorSpeed.Normal" />
+    <Member MemberName="Game">
+      <MemberSignature Language="C#" Value="Game" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.SensorSpeed Game = int32(2)" />
+      <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.SensorSpeed.Game" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -60,14 +60,14 @@
       <ReturnValue>
         <ReturnType>Xamarin.Essentials.SensorSpeed</ReturnType>
       </ReturnValue>
-      <MemberValue>3</MemberValue>
+      <MemberValue>2</MemberValue>
       <Docs>
-        <summary>Default rate suitable for screen orientation changes.</summary>
+        <summary>Rate suitable for games.</summary>
       </Docs>
     </Member>
     <Member MemberName="UI">
       <MemberSignature Language="C#" Value="UI" />
-      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.SensorSpeed UI = int32(2)" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Essentials.SensorSpeed UI = int32(1)" />
       <MemberSignature Language="DocId" Value="F:Xamarin.Essentials.SensorSpeed.UI" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
@@ -77,7 +77,7 @@
       <ReturnValue>
         <ReturnType>Xamarin.Essentials.SensorSpeed</ReturnType>
       </ReturnValue>
-      <MemberValue>2</MemberValue>
+      <MemberValue>1</MemberValue>
       <Docs>
         <summary>Rate suitable for general user interface.</summary>
       </Docs>
diff --git a/docs/en/Xamarin.Essentials/UnitConverters.xml b/docs/en/Xamarin.Essentials/UnitConverters.xml
new file mode 100644
index 000000000..ada05eeb4
--- /dev/null
+++ b/docs/en/Xamarin.Essentials/UnitConverters.xml
@@ -0,0 +1,537 @@
+<Type Name="UnitConverters" FullName="Xamarin.Essentials.UnitConverters">
+  <TypeSignature Language="C#" Value="public static class UnitConverters" />
+  <TypeSignature Language="ILAsm" Value=".class public auto ansi abstract sealed beforefieldinit UnitConverters extends System.Object" />
+  <TypeSignature Language="DocId" Value="T:Xamarin.Essentials.UnitConverters" />
+  <AssemblyInfo>
+    <AssemblyName>Xamarin.Essentials</AssemblyName>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+  </AssemblyInfo>
+  <Base>
+    <BaseTypeName>System.Object</BaseTypeName>
+  </Base>
+  <Interfaces />
+  <Docs>
+    <summary>To be added.</summary>
+    <remarks>To be added.</remarks>
+  </Docs>
+  <Members>
+    <Member MemberName="AtmospheresToPascals">
+      <MemberSignature Language="C#" Value="public static double AtmospheresToPascals (double atm);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 AtmospheresToPascals(float64 atm) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.AtmospheresToPascals(System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="atm" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="atm">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="CelsiusToFahrenheit">
+      <MemberSignature Language="C#" Value="public static double CelsiusToFahrenheit (double celsius);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 CelsiusToFahrenheit(float64 celsius) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.CelsiusToFahrenheit(System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="celsius" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="celsius">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="CelsiusToKelvin">
+      <MemberSignature Language="C#" Value="public static double CelsiusToKelvin (double celsius);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 CelsiusToKelvin(float64 celsius) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.CelsiusToKelvin(System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="celsius" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="celsius">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="CoordinatesToKilometers">
+      <MemberSignature Language="C#" Value="public static double CoordinatesToKilometers (double lat1, double lon1, double lat2, double lon2);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 CoordinatesToKilometers(float64 lat1, float64 lon1, float64 lat2, float64 lon2) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.CoordinatesToKilometers(System.Double,System.Double,System.Double,System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="lat1" Type="System.Double" />
+        <Parameter Name="lon1" Type="System.Double" />
+        <Parameter Name="lat2" Type="System.Double" />
+        <Parameter Name="lon2" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="lat1">To be added.</param>
+        <param name="lon1">To be added.</param>
+        <param name="lat2">To be added.</param>
+        <param name="lon2">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="CoordinatesToMiles">
+      <MemberSignature Language="C#" Value="public static double CoordinatesToMiles (double lat1, double lon1, double lat2, double lon2);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 CoordinatesToMiles(float64 lat1, float64 lon1, float64 lat2, float64 lon2) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.CoordinatesToMiles(System.Double,System.Double,System.Double,System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="lat1" Type="System.Double" />
+        <Parameter Name="lon1" Type="System.Double" />
+        <Parameter Name="lat2" Type="System.Double" />
+        <Parameter Name="lon2" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="lat1">To be added.</param>
+        <param name="lon1">To be added.</param>
+        <param name="lat2">To be added.</param>
+        <param name="lon2">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="DegreesPerSecondToHertz">
+      <MemberSignature Language="C#" Value="public static double DegreesPerSecondToHertz (double degrees);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 DegreesPerSecondToHertz(float64 degrees) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.DegreesPerSecondToHertz(System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="degrees" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="degrees">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="DegreesPerSecondToRadiansPerSecond">
+      <MemberSignature Language="C#" Value="public static double DegreesPerSecondToRadiansPerSecond (double degrees);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 DegreesPerSecondToRadiansPerSecond(float64 degrees) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.DegreesPerSecondToRadiansPerSecond(System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="degrees" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="degrees">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="DegreesToRadians">
+      <MemberSignature Language="C#" Value="public static double DegreesToRadians (double degrees);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 DegreesToRadians(float64 degrees) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.DegreesToRadians(System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="degrees" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="degrees">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="FahrenheitToCelsius">
+      <MemberSignature Language="C#" Value="public static double FahrenheitToCelsius (double fahrenheit);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 FahrenheitToCelsius(float64 fahrenheit) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.FahrenheitToCelsius(System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="fahrenheit" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="fahrenheit">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="HectopascalsToKilopascals">
+      <MemberSignature Language="C#" Value="public static double HectopascalsToKilopascals (double hpa);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 HectopascalsToKilopascals(float64 hpa) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.HectopascalsToKilopascals(System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="hpa" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="hpa">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="HectopascalsToPascals">
+      <MemberSignature Language="C#" Value="public static double HectopascalsToPascals (double hpa);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 HectopascalsToPascals(float64 hpa) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.HectopascalsToPascals(System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="hpa" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="hpa">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="HertzToDegreesPerSecond">
+      <MemberSignature Language="C#" Value="public static double HertzToDegreesPerSecond (double hertz);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 HertzToDegreesPerSecond(float64 hertz) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.HertzToDegreesPerSecond(System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="hertz" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="hertz">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="HertzToRadiansPerSecond">
+      <MemberSignature Language="C#" Value="public static double HertzToRadiansPerSecond (double hertz);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 HertzToRadiansPerSecond(float64 hertz) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.HertzToRadiansPerSecond(System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="hertz" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="hertz">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="KelvinToCelsius">
+      <MemberSignature Language="C#" Value="public static double KelvinToCelsius (double kelvin);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 KelvinToCelsius(float64 kelvin) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.KelvinToCelsius(System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="kelvin" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="kelvin">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="KilometersToMiles">
+      <MemberSignature Language="C#" Value="public static double KilometersToMiles (double kilometers);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 KilometersToMiles(float64 kilometers) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.KilometersToMiles(System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="kilometers" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="kilometers">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="KilopascalsToHectopascals">
+      <MemberSignature Language="C#" Value="public static double KilopascalsToHectopascals (double kpa);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 KilopascalsToHectopascals(float64 kpa) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.KilopascalsToHectopascals(System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="kpa" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="kpa">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="KilopascalsToPascals">
+      <MemberSignature Language="C#" Value="public static double KilopascalsToPascals (double kpa);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 KilopascalsToPascals(float64 kpa) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.KilopascalsToPascals(System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="kpa" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="kpa">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="MilesToKilometers">
+      <MemberSignature Language="C#" Value="public static double MilesToKilometers (double miles);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 MilesToKilometers(float64 miles) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.MilesToKilometers(System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="miles" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="miles">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="MilesToMeters">
+      <MemberSignature Language="C#" Value="public static double MilesToMeters (double miles);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 MilesToMeters(float64 miles) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.MilesToMeters(System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="miles" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="miles">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="PascalsToAtmospheres">
+      <MemberSignature Language="C#" Value="public static double PascalsToAtmospheres (double pascals);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 PascalsToAtmospheres(float64 pascals) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.PascalsToAtmospheres(System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="pascals" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="pascals">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="RadiansPerSecondToDegreesPerSecond">
+      <MemberSignature Language="C#" Value="public static double RadiansPerSecondToDegreesPerSecond (double radians);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 RadiansPerSecondToDegreesPerSecond(float64 radians) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.RadiansPerSecondToDegreesPerSecond(System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="radians" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="radians">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="RadiansPerSecondToHertz">
+      <MemberSignature Language="C#" Value="public static double RadiansPerSecondToHertz (double radians);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 RadiansPerSecondToHertz(float64 radians) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.RadiansPerSecondToHertz(System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="radians" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="radians">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="RadiansToDegrees">
+      <MemberSignature Language="C#" Value="public static double RadiansToDegrees (double radians);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig float64 RadiansToDegrees(float64 radians) cil managed" />
+      <MemberSignature Language="DocId" Value="M:Xamarin.Essentials.UnitConverters.RadiansToDegrees(System.Double)" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyName>Xamarin.Essentials</AssemblyName>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Double</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="radians" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <param name="radians">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+  </Members>
+</Type>
diff --git a/docs/en/index.xml b/docs/en/index.xml
index e8ad4f429..1e374cb7e 100644
--- a/docs/en/index.xml
+++ b/docs/en/index.xml
@@ -78,7 +78,7 @@
           <AttributeName>System.Runtime.Versioning.TargetFramework(".NETCore,Version=v5.0", FrameworkDisplayName=".NET for Windows Universal")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyInformationalVersion("1.0.0+06f6e2b7c393a97f6c3d4b34bb339c7a1081e993")</AttributeName>
+          <AttributeName>System.Reflection.AssemblyInformationalVersion("1.0.0+d9cfb7770de91431fc2a7fdb805d4b829ee6cad2")</AttributeName>
         </Attribute>
       </Attributes>
     </Assembly>
@@ -163,6 +163,7 @@
       <Type Name="SmsMessage" Kind="Class" />
       <Type Name="SpeechOptions" Kind="Class" />
       <Type Name="TextToSpeech" Kind="Class" />
+      <Type Name="UnitConverters" Kind="Class" />
       <Type Name="VersionTracking" Kind="Class" />
       <Type Name="Vibration" Kind="Class" />
     </Namespace>

From 5f20db613a76ffecc9ef31fa77f400d5e54de75d Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Mon, 5 Nov 2018 14:17:17 -0800
Subject: [PATCH 38/43] Catch invalid key exception.

---
 Xamarin.Essentials/SecureStorage/SecureStorage.android.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Xamarin.Essentials/SecureStorage/SecureStorage.android.cs b/Xamarin.Essentials/SecureStorage/SecureStorage.android.cs
index 84992bd66..1c5b0b84b 100644
--- a/Xamarin.Essentials/SecureStorage/SecureStorage.android.cs
+++ b/Xamarin.Essentials/SecureStorage/SecureStorage.android.cs
@@ -131,6 +131,10 @@ ISecretKey GetKey()
 
                     return kp;
                 }
+                catch (InvalidKeyException ikEx)
+                {
+                    System.Diagnostics.Debug.WriteLine($"Unable to unwrap key: Invalid Key. This may be caused by system backup or upgrades. All secure storage items will now be removed. {ikEx.Message}");
+                }
                 catch (IllegalBlockSizeException ibsEx)
                 {
                     System.Diagnostics.Debug.WriteLine($"Unable to unwrap key: Illegal Block Size. This may be caused by system backup or upgrades. All secure storage items will now be removed. {ibsEx.Message}");

From dc5e8b95a60f3a30416fdedd7545227df935784b Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 6 Nov 2018 00:53:06 +0200
Subject: [PATCH 39/43] If there is no main window, then there is no UI thread.
 Closes 510

---
 Xamarin.Essentials/MainThread/MainThread.uwp.cs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/Xamarin.Essentials/MainThread/MainThread.uwp.cs b/Xamarin.Essentials/MainThread/MainThread.uwp.cs
index 73ccfb7c9..30170b8ea 100644
--- a/Xamarin.Essentials/MainThread/MainThread.uwp.cs
+++ b/Xamarin.Essentials/MainThread/MainThread.uwp.cs
@@ -6,8 +6,19 @@ namespace Xamarin.Essentials
 {
     public static partial class MainThread
     {
-        static bool PlatformIsMainThread =>
-            CoreApplication.MainView.CoreWindow?.Dispatcher?.HasThreadAccess ?? false;
+        static bool PlatformIsMainThread
+        {
+            get
+            {
+                // if there is no main window, then this is either a service
+                // or the UI is not yet constructed, so the main thread is the
+                // current thread
+                if (CoreApplication.MainView.CoreWindow == null)
+                    return true;
+
+                return CoreApplication.MainView.CoreWindow.Dispatcher?.HasThreadAccess ?? false;
+            }
+        }
 
         static void PlatformBeginInvokeOnMainThread(Action action)
         {

From 5801de3d9df36bae4bd2fc4cb57de735f9718571 Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Thu, 8 Nov 2018 11:31:42 -0800
Subject: [PATCH 40/43] Fixes #612

We shouldn't have a need for telephony as we don't check it on others and restricts VOIP apps.
---
 .../PhoneDialer/PhoneDialer.ios.cs              | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/Xamarin.Essentials/PhoneDialer/PhoneDialer.ios.cs b/Xamarin.Essentials/PhoneDialer/PhoneDialer.ios.cs
index 025eed4ec..ae1d8c2c8 100644
--- a/Xamarin.Essentials/PhoneDialer/PhoneDialer.ios.cs
+++ b/Xamarin.Essentials/PhoneDialer/PhoneDialer.ios.cs
@@ -9,22 +9,7 @@ public static partial class PhoneDialer
     {
         const string noNetworkProviderCode = "65535";
 
-        internal static bool IsSupported
-        {
-            get
-            {
-                var isDialerInstalled = UIApplication.SharedApplication.CanOpenUrl(CreateNsUrl(new string('0', 10)));
-
-                if (!isDialerInstalled)
-                    return false;
-
-                using (var netInfo = new CTTelephonyNetworkInfo())
-                {
-                    var mnc = netInfo.SubscriberCellularProvider?.MobileNetworkCode;
-                    return !string.IsNullOrEmpty(mnc) && mnc != noNetworkProviderCode;
-                }
-            }
-        }
+        internal static bool IsSupported => UIApplication.SharedApplication.CanOpenUrl(CreateNsUrl(new string('0', 10)));
 
         static void PlatformOpen(string number)
         {

From e0b392ed9e75133c3a03d1a6e8376141d265a7f0 Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Fri, 16 Nov 2018 17:29:23 -0800
Subject: [PATCH 41/43] Integrate html option into sample for email. (#623)

---
 Samples/Samples.Android/Samples.Android.csproj | 4 ++--
 Samples/Samples/View/EmailPage.xaml            | 7 ++++++-
 Samples/Samples/ViewModel/EmailViewModel.cs    | 8 ++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Samples/Samples.Android/Samples.Android.csproj b/Samples/Samples.Android/Samples.Android.csproj
index d49296c38..584c92bac 100644
--- a/Samples/Samples.Android/Samples.Android.csproj
+++ b/Samples/Samples.Android/Samples.Android.csproj
@@ -33,8 +33,8 @@
     <EnableLLVM>false</EnableLLVM>
     <BundleAssemblies>false</BundleAssemblies>
     <EnableProguard>true</EnableProguard>
-    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
-    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+    <AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
+    <EmbedAssembliesIntoApk>false</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Samples/Samples/View/EmailPage.xaml b/Samples/Samples/View/EmailPage.xaml
index 925ab6195..3e92da02f 100644
--- a/Samples/Samples/View/EmailPage.xaml
+++ b/Samples/Samples/View/EmailPage.xaml
@@ -25,9 +25,14 @@
                 <Entry Text="{Binding RecipientsBcc}" />
                 <Label Text="Subject:" />
                 <Entry Text="{Binding Subject}" />
+                <StackLayout Orientation="Horizontal">
+                    <Label Text="Is Html?" HorizontalTextAlignment="End"  HorizontalOptions="FillAndExpand" VerticalOptions="Center"/>
+                    <Switch IsToggled="{Binding IsHtml}" VerticalOptions="Center"/>
+                </StackLayout>
                 <Label Text="Body:" />
                 <Editor Text="{Binding Body}" Keyboard="Chat"
-                        VerticalOptions="FillAndExpand" HeightRequest="200" />
+                        AutoSize="TextChanges"
+                        VerticalOptions="FillAndExpand" HeightRequest="100" />
 
             </StackLayout>
         </ScrollView>
diff --git a/Samples/Samples/ViewModel/EmailViewModel.cs b/Samples/Samples/ViewModel/EmailViewModel.cs
index 5122972dc..22e1ff0cb 100644
--- a/Samples/Samples/ViewModel/EmailViewModel.cs
+++ b/Samples/Samples/ViewModel/EmailViewModel.cs
@@ -14,6 +14,7 @@ public class EmailViewModel : BaseViewModel
         string recipientsTo;
         string recipientsCc;
         string recipientsBcc;
+        bool isHtml;
 
         public EmailViewModel()
         {
@@ -52,6 +53,12 @@ public string RecipientsBcc
             set => SetProperty(ref recipientsBcc, value);
         }
 
+        public bool IsHtml
+        {
+            get => isHtml;
+            set => SetProperty(ref isHtml, value);
+        }
+
         async void OnSendEmail()
         {
             if (IsBusy)
@@ -64,6 +71,7 @@ await Email.ComposeAsync(new EmailMessage
                 {
                     Subject = Subject,
                     Body = Body,
+                    BodyFormat = isHtml ? EmailBodyFormat.Html : EmailBodyFormat.PlainText,
                     To = Split(RecipientsTo),
                     Cc = Split(RecipientsCc),
                     Bcc = Split(RecipientsBcc),

From ffe940053a230560f7ceae9c3ecb22dc474a87dd Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Tue, 20 Nov 2018 11:49:10 -0800
Subject: [PATCH 42/43] Add Unknown to DeviceType. Update .net standard to
 return unknown for platform/idiom/type (#627)

---
 Xamarin.Essentials/DeviceInfo/DeviceInfo.netstandard.cs | 6 +++---
 Xamarin.Essentials/DeviceInfo/DeviceInfo.shared.cs      | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Xamarin.Essentials/DeviceInfo/DeviceInfo.netstandard.cs b/Xamarin.Essentials/DeviceInfo/DeviceInfo.netstandard.cs
index 0c583a4e6..7c2e3cfb0 100644
--- a/Xamarin.Essentials/DeviceInfo/DeviceInfo.netstandard.cs
+++ b/Xamarin.Essentials/DeviceInfo/DeviceInfo.netstandard.cs
@@ -10,10 +10,10 @@ public static partial class DeviceInfo
 
         static string GetVersionString() => throw new NotImplementedInReferenceAssemblyException();
 
-        static DevicePlatform GetPlatform() => throw new NotImplementedInReferenceAssemblyException();
+        static DevicePlatform GetPlatform() => DevicePlatform.Unknown;
 
-        static DeviceIdiom GetIdiom() => throw new NotImplementedInReferenceAssemblyException();
+        static DeviceIdiom GetIdiom() => DeviceIdiom.Unknown;
 
-        static DeviceType GetDeviceType() => throw new NotImplementedInReferenceAssemblyException();
+        static DeviceType GetDeviceType() => DeviceType.Unknown;
     }
 }
diff --git a/Xamarin.Essentials/DeviceInfo/DeviceInfo.shared.cs b/Xamarin.Essentials/DeviceInfo/DeviceInfo.shared.cs
index ae705e35d..2aa432814 100644
--- a/Xamarin.Essentials/DeviceInfo/DeviceInfo.shared.cs
+++ b/Xamarin.Essentials/DeviceInfo/DeviceInfo.shared.cs
@@ -23,7 +23,8 @@ public static partial class DeviceInfo
 
     public enum DeviceType
     {
-        Physical = 0,
-        Virtual = 1
+        Unknown = 0,
+        Physical = 1,
+        Virtual = 2
     }
 }

From 10997898665ea500c355b44045500a2719e88e25 Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Mon, 26 Nov 2018 09:05:09 -0800
Subject: [PATCH 43/43] Update nugetreadme.txt (#625)

---
 nugetreadme.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nugetreadme.txt b/nugetreadme.txt
index 8acb381d4..9397f3709 100644
--- a/nugetreadme.txt
+++ b/nugetreadme.txt
@@ -12,7 +12,11 @@ http://aka.ms/essentials-getstarted
 
 ## Release Notes
 
-See our full release notes: http://aka.ms/essentials-releasenotes
+This preview contains several breaking API changes as we approach our GA release. 
+
+We have documented a full transition guide when migrating from older versions. 
+
+See our full release notes for more information: http://aka.ms/essentials-releasenotes
 
 ## Feedback, Issues, & Feature Requests