From: Kangho Date: Thu, 2 Feb 2017 19:25:40 +0000 (+0900) Subject: Add TV to TargetIdiom (#738) X-Git-Tag: accepted/tizen/common/20170324.122620~107 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4cf32c94986e6541f67c4909ac5428c92a221bce;p=platform%2Fupstream%2Fxamarin-forms.git Add TV to TargetIdiom (#738) --- diff --git a/Xamarin.Forms.Core/OnIdiom.cs b/Xamarin.Forms.Core/OnIdiom.cs index 24ada86..5d3226f 100644 --- a/Xamarin.Forms.Core/OnIdiom.cs +++ b/Xamarin.Forms.Core/OnIdiom.cs @@ -1,4 +1,4 @@ -namespace Xamarin.Forms +namespace Xamarin.Forms { public class OnIdiom { @@ -8,6 +8,8 @@ public T Desktop { get; set; } + public T TV { get; set; } + public static implicit operator T(OnIdiom onIdiom) { switch (Device.Idiom) @@ -19,6 +21,8 @@ return onIdiom.Tablet; case TargetIdiom.Desktop: return onIdiom.Desktop; + case TargetIdiom.TV: + return onIdiom.TV; } } } diff --git a/Xamarin.Forms.Core/TargetIdiom.cs b/Xamarin.Forms.Core/TargetIdiom.cs index d19875d..645ac12 100644 --- a/Xamarin.Forms.Core/TargetIdiom.cs +++ b/Xamarin.Forms.Core/TargetIdiom.cs @@ -5,6 +5,7 @@ namespace Xamarin.Forms Unsupported, Phone, Tablet, - Desktop + Desktop, + TV } -} \ No newline at end of file +} diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms/OnIdiom`1.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms/OnIdiom`1.xml index aed2ddc..6e6b372 100644 --- a/docs/Xamarin.Forms.Core/Xamarin.Forms/OnIdiom`1.xml +++ b/docs/Xamarin.Forms.Core/Xamarin.Forms/OnIdiom`1.xml @@ -139,5 +139,22 @@ + + + + Property + + 2.0.0.0 + + + T + + + Gets or sets the value applied on TV-like devices. + A T. + + + + diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms/TargetIdiom.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms/TargetIdiom.xml index 1541f7a..33c5ed1 100644 --- a/docs/Xamarin.Forms.Core/Xamarin.Forms/TargetIdiom.xml +++ b/docs/Xamarin.Forms.Core/Xamarin.Forms/TargetIdiom.xml @@ -80,6 +80,20 @@ Indicates that the width of the iPad, Windows 8.1, or Android device on which Forms is running is wider than 600 dips. + + + + Field + + 2.0.0.0 + + + Xamarin.Forms.TargetIdiom + + + Indicates that Forms is running on a Tizen app on Tizen TV. + +