diff options
-rw-r--r-- | Xamarin.Forms.Core/Device.cs | 10 | ||||
-rw-r--r-- | Xamarin.Forms.Platform.Android/Forms.cs | 1 | ||||
-rw-r--r-- | Xamarin.Forms.Platform.WinRT.Tablet/Forms.cs | 3 | ||||
-rw-r--r-- | Xamarin.Forms.Platform.iOS/Forms.cs | 1 | ||||
-rw-r--r-- | docs/Xamarin.Forms.Core/Xamarin.Forms/Device.xml | 45 |
5 files changed, 60 insertions, 0 deletions
diff --git a/Xamarin.Forms.Core/Device.cs b/Xamarin.Forms.Core/Device.cs index cfeab5ae..f2e614d0 100644 --- a/Xamarin.Forms.Core/Device.cs +++ b/Xamarin.Forms.Core/Device.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using System.IO; using System.Reflection; @@ -82,6 +83,15 @@ namespace Xamarin.Forms set { s_platformServices = value; } } + [EditorBrowsable(EditorBrowsableState.Never)] + public static IReadOnlyList<string> Flags { get; private set; } + + [EditorBrowsable(EditorBrowsableState.Never)] + public static void SetFlags(IReadOnlyList<string> flags) + { + Flags = flags; + } + public static void BeginInvokeOnMainThread(Action action) { PlatformServices.BeginInvokeOnMainThread(action); diff --git a/Xamarin.Forms.Platform.Android/Forms.cs b/Xamarin.Forms.Platform.Android/Forms.cs index 5d0b4c13..bbb605f9 100644 --- a/Xamarin.Forms.Platform.Android/Forms.cs +++ b/Xamarin.Forms.Platform.Android/Forms.cs @@ -131,6 +131,7 @@ namespace Xamarin.Forms } Device.Info = new AndroidDeviceInfo(activity); + Device.SetFlags(s_flags); var ticker = Ticker.Default as AndroidTicker; if (ticker != null) diff --git a/Xamarin.Forms.Platform.WinRT.Tablet/Forms.cs b/Xamarin.Forms.Platform.WinRT.Tablet/Forms.cs index feecdb92..c2ad613d 100644 --- a/Xamarin.Forms.Platform.WinRT.Tablet/Forms.cs +++ b/Xamarin.Forms.Platform.WinRT.Tablet/Forms.cs @@ -45,6 +45,9 @@ namespace Xamarin.Forms Device.SetIdiom(TargetIdiom.Tablet); Device.PlatformServices = new WindowsPlatformServices(Window.Current.Dispatcher); +#if WINDOWS_UWP + Device.SetFlags(s_flags); +#endif Device.Info = new WindowsDeviceInfo(); #if WINDOWS_UWP diff --git a/Xamarin.Forms.Platform.iOS/Forms.cs b/Xamarin.Forms.Platform.iOS/Forms.cs index d7455a88..a47efd04 100644 --- a/Xamarin.Forms.Platform.iOS/Forms.cs +++ b/Xamarin.Forms.Platform.iOS/Forms.cs @@ -93,6 +93,7 @@ namespace Xamarin.Forms #else Device.SetIdiom(TargetIdiom.Desktop); #endif + Device.SetFlags(s_flags); Device.PlatformServices = new IOSPlatformServices(); Device.Info = new IOSDeviceInfo(); diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms/Device.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms/Device.xml index 5f43ecc0..7cb9d5f4 100644 --- a/docs/Xamarin.Forms.Core/Xamarin.Forms/Device.xml +++ b/docs/Xamarin.Forms.Core/Xamarin.Forms/Device.xml @@ -71,6 +71,27 @@ Device.BeginInvokeOnMainThread (() => { </remarks> </Docs> </Member> + <Member MemberName="Flags"> + <MemberSignature Language="C#" Value="public static System.Collections.Generic.IReadOnlyList<string> Flags { get; }" /> + <MemberSignature Language="ILAsm" Value=".property class System.Collections.Generic.IReadOnlyList`1<string> Flags" /> + <MemberType>Property</MemberType> + <AssemblyInfo> + <AssemblyVersion>2.0.0.0</AssemblyVersion> + </AssemblyInfo> + <Attributes> + <Attribute> + <AttributeName>System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)</AttributeName> + </Attribute> + </Attributes> + <ReturnValue> + <ReturnType>System.Collections.Generic.IReadOnlyList<System.String></ReturnType> + </ReturnValue> + <Docs> + <summary>To be added.</summary> + <value>To be added.</value> + <remarks>To be added.</remarks> + </Docs> + </Member> <Member MemberName="GetAssemblies"> <MemberSignature Language="C#" Value="public static System.Reflection.Assembly[] GetAssemblies ();" /> <MemberSignature Language="ILAsm" Value=".method public static hidebysig class System.Reflection.Assembly[] GetAssemblies() cil managed" /> @@ -468,6 +489,30 @@ button.HeightRequest = Device.OnPlatform (20,30,30); <remarks>To be added.</remarks> </Docs> </Member> + <Member MemberName="SetFlags"> + <MemberSignature Language="C#" Value="public static void SetFlags (System.Collections.Generic.IReadOnlyList<string> flags);" /> + <MemberSignature Language="ILAsm" Value=".method public static hidebysig void SetFlags(class System.Collections.Generic.IReadOnlyList`1<string> flags) cil managed" /> + <MemberType>Method</MemberType> + <AssemblyInfo> + <AssemblyVersion>2.0.0.0</AssemblyVersion> + </AssemblyInfo> + <Attributes> + <Attribute> + <AttributeName>System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)</AttributeName> + </Attribute> + </Attributes> + <ReturnValue> + <ReturnType>System.Void</ReturnType> + </ReturnValue> + <Parameters> + <Parameter Name="flags" Type="System.Collections.Generic.IReadOnlyList<System.String>" /> + </Parameters> + <Docs> + <param name="flags">To be added.</param> + <summary>To be added.</summary> + <remarks>To be added.</remarks> + </Docs> + </Member> <Member MemberName="SetIdiom"> <MemberSignature Language="C#" Value="public static void SetIdiom (Xamarin.Forms.TargetIdiom value);" /> <MemberSignature Language="ILAsm" Value=".method public static hidebysig void SetIdiom(valuetype Xamarin.Forms.TargetIdiom value) cil managed" /> |