5 files changed, 40 insertions, 1 deletions

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/KeyboardCoreGalleryPage.cs b/Xamarin.Forms.Controls/CoreGalleryPages/KeyboardCoreGalleryPage.cs
index cf5f2139..55110045 100644
--- a/Xamarin.Forms.Controls/CoreGalleryPages/KeyboardCoreGalleryPage.cs
+++ b/Xamarin.Forms.Controls/CoreGalleryPages/KeyboardCoreGalleryPage.cs
@@ -14,6 +14,7 @@ namespace Xamarin.Forms.Controls
 				Keyboard.Default,
 				Keyboard.Email,
 				Keyboard.Numeric,
+				Keyboard.Plain,
 				Keyboard.Telephone,
 				Keyboard.Text,
 				Keyboard.Url
@@ -27,6 +28,7 @@ namespace Xamarin.Forms.Controls
 			}
 
 			var customKeyboards = new [] {
+				Tuple.Create ("None", Keyboard.Create (KeyboardFlags.None)),
 				Tuple.Create ("Suggestions", Keyboard.Create (KeyboardFlags.Suggestions)),
 				Tuple.Create ("Spellcheck", Keyboard.Create (KeyboardFlags.Spellcheck)),
 				Tuple.Create ("SpellcheckSuggestions", Keyboard.Create (KeyboardFlags.Spellcheck | KeyboardFlags.Suggestions)),
diff --git a/Xamarin.Forms.Core/Keyboard.cs b/Xamarin.Forms.Core/Keyboard.cs
index 56d5ca8c..ac07a0b2 100644
--- a/Xamarin.Forms.Core/Keyboard.cs
+++ b/Xamarin.Forms.Core/Keyboard.cs
@@ -3,6 +3,8 @@ namespace Xamarin.Forms
 	[TypeConverter(typeof(KeyboardTypeConverter))]
 	public class Keyboard
 	{
+		static Keyboard s_plain;
+
 		static Keyboard s_def;
 
 		static Keyboard s_email;
@@ -21,8 +23,12 @@ namespace Xamarin.Forms
 		{
 		}
 
-		public static Keyboard Chat
+		public static Keyboard Plain
 		{
+			get { return s_plain ?? (s_plain = new CustomKeyboard(KeyboardFlags.None)); }
+		}
+
+		public static Keyboard Chat {
 			get { return s_chat ?? (s_chat = new ChatKeyboard()); }
 		}
 
diff --git a/Xamarin.Forms.Core/KeyboardFlags.cs b/Xamarin.Forms.Core/KeyboardFlags.cs
index 5ac2f1cc..d654aa80 100644
--- a/Xamarin.Forms.Core/KeyboardFlags.cs
+++ b/Xamarin.Forms.Core/KeyboardFlags.cs
@@ -5,6 +5,7 @@ namespace Xamarin.Forms
 	[Flags]
 	public enum KeyboardFlags
 	{
+		None = 0,
 		CapitalizeSentence = 1,
 		Spellcheck = 1 << 1,
 		Suggestions = 1 << 2,
diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms/Keyboard.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms/Keyboard.xml
index 1fa660cc..7c54173d 100644
--- a/docs/Xamarin.Forms.Core/Xamarin.Forms/Keyboard.xml
+++ b/docs/Xamarin.Forms.Core/Xamarin.Forms/Keyboard.xml
@@ -139,6 +139,22 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName="Plain">
+      <MemberSignature Language="C#" Value="public static Xamarin.Forms.Keyboard Plain { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property class Xamarin.Forms.Keyboard Plain" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>2.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Xamarin.Forms.Keyboard</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>Returns a new keyboard with None <see cref="T:Xamarin.Forms.KeyboardFlags" /> ".</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Telephone">
       <MemberSignature Language="C#" Value="public static Xamarin.Forms.Keyboard Telephone { get; }" />
       <MemberSignature Language="ILAsm" Value=".property class Xamarin.Forms.Keyboard Telephone" />
diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms/KeyboardFlags.xml b/docs/Xamarin.Forms.Core/Xamarin.Forms/KeyboardFlags.xml
index ea7d6a39..1db0a490 100644
--- a/docs/Xamarin.Forms.Core/Xamarin.Forms/KeyboardFlags.xml
+++ b/docs/Xamarin.Forms.Core/Xamarin.Forms/KeyboardFlags.xml
@@ -64,6 +64,20 @@
         <summary>Capitalize the first words of sentences.</summary>
       </Docs>
     </Member>
+    <Member MemberName="None">
+      <MemberSignature Language="C#" Value="None" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.KeyboardFlags None = int32(0)" />
+      <MemberType>Field</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>2.0.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Xamarin.Forms.KeyboardFlags</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>No special features provided by the keyboard.</summary>
+      </Docs>
+    </Member>
     <Member MemberName="Spellcheck">
       <MemberSignature Language="C#" Value="Spellcheck" />
       <MemberSignature Language="ILAsm" Value=".field public static literal valuetype Xamarin.Forms.KeyboardFlags Spellcheck = int32(2)" />