Merge pull request #2522 from keveleigh/Keyboard

Minor keyboard fixes

Author: David Kline

Assets/HoloToolkit/UX/Scripts/Keyboard.cs

@@ -253,7 +253,7 @@ protected override void Awake()
 
             // Setting the keyboardType to an undefined TouchScreenKeyboardType,
             // which prevents the MRTK keyboard from triggering the system keyboard itself.
-            InputField.keyboardType = (TouchScreenKeyboardType)(-1);
+            InputField.keyboardType = (TouchScreenKeyboardType)(int.MaxValue);
 
             // Keep keyboard deactivated until needed
             gameObject.SetActive(false);

Assets/HoloToolkit/UX/Scripts/KeyboardInputField.cs

@@ -34,21 +34,24 @@ public override void OnPointerClick(PointerEventData eventData)
         {
             base.OnPointerClick(eventData);
 
-            Keyboard.Instance.Close();
-            Keyboard.Instance.PresentKeyboard(text, KeyboardLayout);
-
-            if (KeyboardSpawnPoint != null)
-            {
-                Keyboard.Instance.RepositionKeyboard(KeyboardSpawnPoint, null, KeyBoardPositionOffset);
-            }
-            else
+            if (!TouchScreenKeyboard.isSupported)
             {
-                Keyboard.Instance.RepositionKeyboard(transform, null, KeyBoardPositionOffset);
-            }
+                Keyboard.Instance.Close();
+                Keyboard.Instance.PresentKeyboard(text, KeyboardLayout);
+
+                if (KeyboardSpawnPoint != null)
+                {
+                    Keyboard.Instance.RepositionKeyboard(KeyboardSpawnPoint, null, KeyBoardPositionOffset);
+                }
+                else
+                {
+                    Keyboard.Instance.RepositionKeyboard(transform, null, KeyBoardPositionOffset);
+                }
 
-            // Subscribe to keyboard delegates
-            Keyboard.Instance.OnTextUpdated += Keyboard_OnTextUpdated;
-            Keyboard.Instance.OnClosed += Keyboard_OnClosed;
+                // Subscribe to keyboard delegates
+                Keyboard.Instance.OnTextUpdated += Keyboard_OnTextUpdated;
+                Keyboard.Instance.OnClosed += Keyboard_OnClosed;
+            }
         }
 
         /// <summary>