Merge pull request #2132 from davidkline-ms/kbd1978

Re-enable keyboard caret, move test scene
microsoft · May 18, 2018 · 6f0934d · 6f0934d
2 parents ca8a57d + acc6f59
commit 6f0934d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/...-Examples/Input/Scenes/KeyboardTest.unity → ...kit-Examples/UX/Scenes/KeyboardTest.unity b/...-Examples/Input/Scenes/KeyboardTest.unity → ...kit-Examples/UX/Scenes/KeyboardTest.unity
diff --git a/...ples/Input/Scenes/KeyboardTest.unity.meta → ...xamples/UX/Scenes/KeyboardTest.unity.meta b/...ples/Input/Scenes/KeyboardTest.unity.meta → ...xamples/UX/Scenes/KeyboardTest.unity.meta
diff --git a/Assets/HoloToolkit/UX/Scripts/Keyboard.cs b/Assets/HoloToolkit/UX/Scripts/Keyboard.cs
@@ -378,8 +378,8 @@ public void PresentKeyboard()
 
             OnPlacement(this, EventArgs.Empty);
 
-            //This bring up the default keyboard in MR so the user is presented with TWO keyboards
-            //InputField.ActivateInputField();
+            // todo: if the app is built for xaml, our prefab and the system keyboard may be displayed.
+            InputField.ActivateInputField();
 
             SetMicrophoneDefault();
         }