From 3d933e1810fa6c4cb549f9da9004f3da53ea0a3b Mon Sep 17 00:00:00 2001
From: Cristian Luis Duarte <cristian.duarte.mb@gmail.com>
Date: Fri, 9 Mar 2018 17:41:05 -0300
Subject: [PATCH] Android - Joystick hidden when opening login and shown after
 Cancel.

---
 interface/resources/qml/+android/LoginDialog.qml              | 4 +++-
 .../resources/qml/LoginDialog/+android/LinkAccountBody.qml    | 2 +-
 scripts/system/+android/avatarSelection.js                    | 2 --
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/interface/resources/qml/+android/LoginDialog.qml b/interface/resources/qml/+android/LoginDialog.qml
index 9eb2c74147..7753e9937d 100644
--- a/interface/resources/qml/+android/LoginDialog.qml
+++ b/interface/resources/qml/+android/LoginDialog.qml
@@ -38,7 +38,8 @@ ModalWindow {
     keyboardOverride: true  // Disable ModalWindow's keyboard.
 
     function tryDestroy() {
-        root.destroy()
+        Controller.setVPadHidden(false);
+        root.destroy();
     }
 
     LoginDialog {
@@ -54,6 +55,7 @@ ModalWindow {
         this.anchors.centerIn = undefined;
         this.y=150;
         this.x=(parent.width - this.width)/2;
+        Controller.setVPadHidden(true);
     }
 
     Keys.onPressed: {
diff --git a/interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml
index 7eced0c751..38e65af4ca 100644
--- a/interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml
@@ -224,7 +224,7 @@ Item {
 
             onClicked: {
                 Qt.inputMethod.hide();
-                root.destroy();
+                root.tryDestroy();
             }
         }
     }
diff --git a/scripts/system/+android/avatarSelection.js b/scripts/system/+android/avatarSelection.js
index d87a57dfa9..2b28fe2c9b 100644
--- a/scripts/system/+android/avatarSelection.js
+++ b/scripts/system/+android/avatarSelection.js
@@ -115,8 +115,6 @@ module.exports = {
             qml: "hifi/avatarSelection.qml",
             visible: false
         });
-        /*,
-            visible: false*/
         if (window) {
             window.fromQml.connect(fromQml);
         }