diff options
| author | Kangho Hur <kangho.hur@samsung.com> | 2017-02-03 15:21:16 +0900 |
|---|---|---|
| committer | Kangho Hur <kangho.hur@samsung.com> | 2017-04-24 13:36:52 +0900 |
| commit | 4e7799ba5c0662dcca8fecaaff1979edd3bbda8e (patch) | |
| tree | 32d8b834bdf7f82e833170b48cd0f6b824541f90 /Xamarin.Forms.Core | |
| parent | 904b0c14a83a3abaad4a8ca1afa29ddadbb5e43d (diff) | |
| download | xamarin-forms-4e7799ba5c0662dcca8fecaaff1979edd3bbda8e.tar.gz xamarin-forms-4e7799ba5c0662dcca8fecaaff1979edd3bbda8e.tar.bz2 xamarin-forms-4e7799ba5c0662dcca8fecaaff1979edd3bbda8e.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 e1bbd510..4131b18d 100755..100644 --- a/Xamarin.Forms.Core/Device.cs +++ b/Xamarin.Forms.Core/Device.cs @@ -16,6 +16,7 @@ namespace Xamarin.Forms public const string UWP = "UWP"; public const string WinRT = "WinRT"; public const string macOS = "macOS"; + public const string Tizen = "Tizen"; [EditorBrowsable(EditorBrowsableState.Never)] public static DeviceInfo info; @@ -200,4 +201,4 @@ namespace Xamarin.Forms public static readonly Style CaptionStyle = new Style(typeof(Label)) { BaseResourceKey = CaptionStyleKey }; } } -}
\ No newline at end of file +} |