summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordarkleem <cdark.lim@samsung.com>2017-10-12 12:29:32 (GMT)
committerdarkleem <cdark.lim@samsung.com>2017-10-23 07:20:53 (GMT)
commit18840c4d9341d1926d1913f715deb60aacfd1162 (patch)
treec4f70b031ce410099f5924ff618a0964685a7c50
parent00b2a18605b34c092c8fb588188353c300e7bba1 (diff)
downloadxamarin-forms-18840c4d9341d1926d1913f715deb60aacfd1162.zip
xamarin-forms-18840c4d9341d1926d1913f715deb60aacfd1162.tar.gz
xamarin-forms-18840c4d9341d1926d1913f715deb60aacfd1162.tar.bz2
Fixed incorrect appearance and behavior of Entry Keyboard Property.refs/changes/57/155257/7
- 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>
-rw-r--r--Xamarin.Forms.Platform.Tizen/Extensions/KeyboardExtensions.cs6
-rw-r--r--Xamarin.Forms.Platform.Tizen/Native/Entry.cs11
-rw-r--r--Xamarin.Forms.Platform.Tizen/Native/Keyboard.cs7
-rw-r--r--Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs1
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 6acfe3f..0984b02 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 8276aaa..9b84cb3 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 4223ca0..40b21e4 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 14cc5b6..5de5db0 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