diff options
| author | Kangho Hur <kangho.hur@samsung.com> | 2017-03-24 06:28:01 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2017-03-24 06:28:01 -0700 |
| commit | 932e0577963e9565e853d52a1f6f5cdb0c72b10b (patch) | |
| tree | 6a313e0eef461238af5ad150c8d32d075144718a | |
| parent | 1db5bebd7fa9ae252260d1fd2b71b1dbaa5003ba (diff) | |
| parent | 34eba499b58193fe467ef673da093e91a0d55ef3 (diff) | |
| download | xamarin-forms-932e0577963e9565e853d52a1f6f5cdb0c72b10b.tar.gz xamarin-forms-932e0577963e9565e853d52a1f6f5cdb0c72b10b.tar.bz2 xamarin-forms-932e0577963e9565e853d52a1f6f5cdb0c72b10b.zip | |
Merge "Fix SVACE issue" into tizensubmit/tizen/20170324.133015accepted/tizen/common/20170324.170041
3 files changed, 5 insertions, 12 deletions
diff --git a/Xamarin.Forms.Platform.Tizen/Extensions/KeyboardExtensions.cs b/Xamarin.Forms.Platform.Tizen/Extensions/KeyboardExtensions.cs index 000b6bb2..9cc02b2a 100644 --- a/Xamarin.Forms.Platform.Tizen/Extensions/KeyboardExtensions.cs +++ b/Xamarin.Forms.Platform.Tizen/Extensions/KeyboardExtensions.cs @@ -9,11 +9,7 @@ namespace Xamarin.Forms.Platform.Tizen /// <param name="keyboard">The Xamarin.Forms.Keyboard class instance to be converted to ElmSharp.Keyboard.</param> public static Native.Keyboard ToNative(this Keyboard keyboard) { - if (keyboard is TextKeyboard) - { - return Native.Keyboard.Normal; - } - else if (keyboard is NumericKeyboard) + if (keyboard is NumericKeyboard) { return Native.Keyboard.Number; } @@ -39,4 +35,4 @@ namespace Xamarin.Forms.Platform.Tizen } } } -} +}
\ No newline at end of file diff --git a/Xamarin.Forms.Platform.Tizen/GestureDetector.cs b/Xamarin.Forms.Platform.Tizen/GestureDetector.cs index f2a3aac9..2bbb066e 100644 --- a/Xamarin.Forms.Platform.Tizen/GestureDetector.cs +++ b/Xamarin.Forms.Platform.Tizen/GestureDetector.cs @@ -129,6 +129,7 @@ namespace Xamarin.Forms.Platform.Tizen switch (gestureType) { case EGestureType.Tap: + case EGestureType.TripleTap: AddTapGesture(gestureType); break; @@ -136,10 +137,6 @@ namespace Xamarin.Forms.Platform.Tizen AddDoubleTapGesture(gestureType, timeout); break; - case EGestureType.TripleTap: - AddTapGesture(gestureType); - break; - case EGestureType.LongTap: AddLongTapGesture(gestureType, timeout); break; diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs index 4953b6b8..760abc3b 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs @@ -414,7 +414,7 @@ namespace Xamarin.Forms.Platform.Tizen nre.Task = _currentTaskSource.Task; } else - topItem.Delete(); + topItem?.Delete(); } } @@ -476,4 +476,4 @@ namespace Xamarin.Forms.Platform.Tizen } } } -} +}
\ No newline at end of file |