From 18840c4d9341d1926d1913f715deb60aacfd1162 Mon Sep 17 00:00:00 2001
From: darkleem <cdark.lim@samsung.com>
Date: Thu, 12 Oct 2017 21:29:32 +0900
Subject: Fixed incorrect appearance and behavior of Entry Keyboard Property.

  - TASK=TCAPI-2718
  - refernce link : https://developer.xamarin.com/recipes/cross-platform/xamarin-forms/controls/choose-keyboard-for-entry/

Change-Id: I347a70208e3bd9baa43cc08b537d3da22efdb8be
Signed-off-by: darkleem <cdark.lim@samsung.com>
---
 Xamarin.Forms.Platform.Tizen/Extensions/KeyboardExtensions.cs |  6 +-----
 Xamarin.Forms.Platform.Tizen/Native/Entry.cs                  | 11 +++++++++++
 Xamarin.Forms.Platform.Tizen/Native/Keyboard.cs               |  7 ++++++-
 Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs       |  1 -
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Xamarin.Forms.Platform.Tizen/Extensions/KeyboardExtensions.cs b/Xamarin.Forms.Platform.Tizen/Extensions/KeyboardExtensions.cs
index 6acfe3f6..0984b022 100644
--- a/Xamarin.Forms.Platform.Tizen/Extensions/KeyboardExtensions.cs
+++ b/Xamarin.Forms.Platform.Tizen/Extensions/KeyboardExtensions.cs
@@ -13,7 +13,7 @@ namespace Xamarin.Forms.Platform.Tizen
 		{
 			if (keyboard == Keyboard.Numeric)
 			{
-				return Native.Keyboard.NumberOnly;
+				return Native.Keyboard.Numeric;
 			}
 			else if (keyboard == Keyboard.Telephone)
 			{
@@ -27,10 +27,6 @@ namespace Xamarin.Forms.Platform.Tizen
 			{
 				return Native.Keyboard.Url;
 			}
-			else if (keyboard == Keyboard.Chat)
-			{
-				return Native.Keyboard.Emoticon;
-			}
 			else
 			{
 				return Native.Keyboard.Normal;
diff --git a/Xamarin.Forms.Platform.Tizen/Native/Entry.cs b/Xamarin.Forms.Platform.Tizen/Native/Entry.cs
index 8276aaa2..9b84cb3d 100644
--- a/Xamarin.Forms.Platform.Tizen/Native/Entry.cs
+++ b/Xamarin.Forms.Platform.Tizen/Native/Entry.cs
@@ -12,6 +12,9 @@ namespace Xamarin.Forms.Platform.Tizen.Native
 	/// </summary>
 	public class Entry : EEntry, IMeasurable, IBatchable
 	{
+		static readonly int s_VariationNormal = 0;
+		static readonly int s_VariationSignedAndDecimal = 3;
+
 		/// <summary>
 		/// Holds the formatted text of the entry.
 		/// </summary>
@@ -401,10 +404,18 @@ namespace Xamarin.Forms.Platform.Tizen.Native
 			{
 				SetInputPanelEnabled(false);
 			}
+			else if (Keyboard == Keyboard.Numeric)
+			{
+				SetInputPanelEnabled(true);
+				SetInputPanelLayout(InputPanelLayout.NumberOnly);
+				// InputPanelVariation is used to allow using deciaml point.
+				InputPanelVariation = s_VariationSignedAndDecimal;
+			}
 			else
 			{
 				SetInputPanelEnabled(true);
 				SetInputPanelLayout((InputPanelLayout)keyboard);
+				InputPanelVariation = s_VariationNormal;
 			}
 		}
 
diff --git a/Xamarin.Forms.Platform.Tizen/Native/Keyboard.cs b/Xamarin.Forms.Platform.Tizen/Native/Keyboard.cs
index 4223ca08..40b21e47 100644
--- a/Xamarin.Forms.Platform.Tizen/Native/Keyboard.cs
+++ b/Xamarin.Forms.Platform.Tizen/Native/Keyboard.cs
@@ -78,7 +78,12 @@
 		/// <summary>
 		/// Keyboard layout type emoticons.
 		/// </summary>
-		Emoticon
+		Emoticon,
+
+		/// <summary>
+		/// Keyboard layout type numeric.
+		/// </summary>
+		Numeric = Emoticon + 2017,
 	}
 }
 
diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs
index 14cc5b65..5de5db00 100644
--- a/Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs
+++ b/Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs
@@ -1,5 +1,4 @@
 using System;
-using Xamarin.Forms.Platform.Tizen.Native;
 using Specific = Xamarin.Forms.PlatformConfiguration.TizenSpecific.Entry;
 
 namespace Xamarin.Forms.Platform.Tizen
-- 
cgit v1.2.3