+android -> +android_interface

CMakeLists.txt

@@ -80,6 +80,7 @@ endif()
 if (ANDROID)
   set(GLES_OPTION ON)
   set(PLATFORM_QT_COMPONENTS AndroidExtras WebView)
+  add_definitions(-DHIFI_ANDROID_APP=\"${HIFI_ANDROID_APP}\")
 else ()
   set(PLATFORM_QT_COMPONENTS WebEngine)
 endif ()

libraries/shared/src/shared/FileUtils.cpp

@@ -32,7 +32,7 @@ const QStringList& FileUtils::getFileSelectors() {
     std::call_once(once, [] {
 
 #if defined(Q_OS_ANDROID)
-        //extraSelectors << "android_" HIFI_ANDROID_APP;
+        extraSelectors << "android_" HIFI_ANDROID_APP;
 #endif
 
 #if defined(USE_GLES)

scripts/+android_questInterface/defaultScripts.js

@@ -25,6 +25,7 @@ var DEFAULT_SCRIPTS_COMBINED = [
     "system/notifications.js",
     "system/commerce/wallet.js",
     "system/dialTone.js",
+    "system/quickGoto.js",
     "system/firstPersonHMD.js",
     "system/tablet-ui/tabletUI.js",
     "system/miniTablet.js"

scripts/system/quickGoto.js

@@ -0,0 +1,36 @@
+"use strict";
+
+//
+//  quickGoto.js
+//  scripts/system/
+//
+//  Created by Dante Ruiz
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+/* globals Tablet, Toolbars, Script, HMD, DialogsManager */
+
+(function() { // BEGIN LOCAL_SCOPE
+
+    function addGotoButton(destination) {
+        tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+        button = tablet.addButton({
+            icon: "icons/tablet-icons/goto-i.svg",
+            activeIcon: "icons/tablet-icons/goto-a.svg",
+            text: destination
+        });
+        var buttonDestination = destination;
+        button.clicked.connect(function() {
+            Window.location = "hifi://" + buttonDestination;
+        });
+        Script.scriptEnding.connect(function () {
+            tablet.removeButton(button);
+        });
+    }
+
+    addGotoButton("dev-mobile");
+    addGotoButton("quest-dev");
+
+}()); // END LOCAL_SCOPE