Merge pull request #13948 from danteruiz/3d-keyboard

3D Keyboard.

interface/resources/qml/controls/TabletWebView.qml

@@ -195,6 +195,10 @@ Item {
         keyboardEnabled = HMD.active;
     }
 
+    Component.onDestruction: {
+        keyboardRaised = false;
+    }
+
     Keys.onPressed: {
         switch(event.key) {
         case Qt.Key_L:

interface/resources/qml/controlsUit/Keyboard.qml

@@ -36,13 +36,29 @@ Rectangle {
 
     readonly property int raisedHeight: keyboardHeight + (showMirrorText ? keyboardRowHeight : 0)
 
-    height: enabled && raised ? raisedHeight : 0
-    visible: enabled && raised
+    height: 0
+    visible: false
 
     property bool shiftMode: false
     property bool numericShiftMode: false
 
+
+    onPasswordChanged: {
+        var use3DKeyboard = (typeof MenuInterface === "undefined") ? false : MenuInterface.isOptionChecked("Use 3D Keyboard");
+        if (use3DKeyboard) {
+            KeyboardScriptingInterface.password = password;
+        }
+    }
+
     onRaisedChanged: {
+        var use3DKeyboard = (typeof MenuInterface === "undefined") ? false : MenuInterface.isOptionChecked("Use 3D Keyboard");
+        if (!use3DKeyboard) {
+            keyboardBase.height = raised ? raisedHeight : 0;
+            keyboardBase.visible = raised;
+        } else {
+            KeyboardScriptingInterface.raised = raised;
+            KeyboardScriptingInterface.password = raised ? password : false;
+        }
         mirroredText = "";
     }
 

interface/resources/qml/dialogs/TabletLoginDialog.qml

@@ -95,6 +95,18 @@ TabletModalWindow {
         }
     }
 
+    Timer {
+        id: keyboardTimer
+        repeat: false
+        interval: 200
+
+        onTriggered: {
+            if (MenuInterface.isOptionChecked("Use 3D Keyboard")) {
+                KeyboardScriptingInterface.raised = true;
+            }
+        }
+    }
+
     TabletModalFrame {
         id: mfRoot
 
@@ -127,6 +139,14 @@ TabletModalWindow {
         }
     }
 
+    Component.onDestruction: {
+        loginKeyboard.raised = false;
+    }
+
+    Component.onCompleted: {
+        keyboardTimer.start();
+    }
+
     Keyboard {
         id: loginKeyboard
         raised: root.keyboardEnabled && root.keyboardRaised

interface/resources/qml/hifi/AvatarApp.qml

@@ -19,7 +19,7 @@ Rectangle {
     HifiControls.Keyboard {
         id: keyboard
         z: 1000
-        raised: parent.keyboardEnabled && parent.keyboardRaised
+        raised: parent.keyboardEnabled && parent.keyboardRaised && HMD.active
         numeric: parent.punctuationMode
         anchors {
             left: parent.left
@@ -204,7 +204,8 @@ Rectangle {
 
     property bool isInManageState: false
 
-    Component.onCompleted: {
+    Component.onDestruction: {
+        keyboard.raised = false;
     }
 
     AvatarAppStyle {
@@ -235,6 +236,8 @@ Rectangle {
         avatarIconVisible: mainPageVisible
         settingsButtonVisible: mainPageVisible
         onSettingsClicked: {
+            displayNameInput.focus = false;
+            root.keyboardRaised = false;
             settings.open(currentAvatarSettings, currentAvatar.avatarScale);
         }
     }
@@ -344,6 +347,10 @@ Rectangle {
                 emitSendToScript({'method' : 'changeDisplayName', 'displayName' : text})
                 focus = false;
             }
+
+            onFocusChanged: {
+                root.keyboardRaised = focus;
+            }
         }
 
         ShadowImage {