diff options
| author | Kangho Hur <kangho.hur@samsung.com> | 2017-02-03 15:21:16 +0900 |
|---|---|---|
| committer | Kangho Hur <kangho.hur@samsung.com> | 2017-03-24 13:19:01 +0900 |
| commit | 258d67fd681305b8eab03bcaa61fcf4da4eaebc0 (patch) | |
| tree | a12c7de5ff6b241e3e907a0ba8040d5b212cc40d /Xamarin.Forms.Core | |
| parent | d13398b202b91fe8a0137d6ac5cf5286d4778cb2 (diff) | |
| download | xamarin-forms-258d67fd681305b8eab03bcaa61fcf4da4eaebc0.tar.gz xamarin-forms-258d67fd681305b8eab03bcaa61fcf4da4eaebc0.tar.bz2 xamarin-forms-258d67fd681305b8eab03bcaa61fcf4da4eaebc0.zip | |
Rebase Forms to upstream lastest (2.3.4-pre2)
- Synced with 3c7b291. (https://github.com/xamarin/Xamarin.Forms/commit/3c7b2918b3065a81ecb4040fde09d93aae09f62d)
- [Core] Device.Tizen has been added newly.
- Package version has updated to 2.3.4-r190-001
Change-Id: I948fd73212744aa8c1941dc6a6d8e46eb29523af
Diffstat (limited to 'Xamarin.Forms.Core')
| -rw-r--r--[-rwxr-xr-x] | Xamarin.Forms.Core/Device.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Xamarin.Forms.Core/Device.cs b/Xamarin.Forms.Core/Device.cs index cbc44f26..2987ea5a 100755..100644 --- a/Xamarin.Forms.Core/Device.cs +++ b/Xamarin.Forms.Core/Device.cs @@ -13,6 +13,7 @@ namespace Xamarin.Forms public const string WinPhone = "WinPhone"; public const string Windows = "Windows"; public const string macOS = "macOS"; + public const string Tizen = "Tizen"; internal static DeviceInfo info; @@ -179,4 +180,4 @@ namespace Xamarin.Forms public static readonly Style CaptionStyle = new Style(typeof(Label)) { BaseResourceKey = CaptionStyleKey }; } } -}
\ No newline at end of file +} |