Merge pull request #14863 from danteruiz/android-apps-directories

Case 20877: Support CMake time configuration of QmlFileSelectors

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_interface/defaultScripts.js

@@ -13,10 +13,10 @@
 
 var DEFAULT_SCRIPTS_COMBINED = [
     "system/progress.js",
-    "system/+android/touchscreenvirtualpad.js",
+    "system/+android_interface/touchscreenvirtualpad.js",
-    "system/+android/actionbar.js",
+    "system/+android_interface/actionbar.js",
-    "system/+android/audio.js" ,
+    "system/+android_interface/audio.js" ,
-    "system/+android/modes.js"/*,
+    "system/+android_interface/modes.js"/*,
     "system/away.js",
     "system/controllers/controllerDisplayManager.js",
     "system/controllers/handControllerGrabAndroid.js",
@@ -33,7 +33,7 @@ var DEFAULT_SCRIPTS_COMBINED = [
 ];
 
 var DEBUG_SCRIPTS = [
-    "system/+android/stats.js"
+    "system/+android_interface/stats.js"
 ];
 
 var DEFAULT_SCRIPTS_SEPARATE = [ ];

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/+android_interface/actionbar.js

@@ -26,8 +26,8 @@ function init() {
         qml: "hifi/ActionBar.qml"
     });
     backButton = actionbar.addButton({
-        icon: "icons/+android/backward.svg",
+        icon: "icons/+android_interface/backward.svg",
-        activeIcon: "icons/+android/backward.svg",
+        activeIcon: "icons/+android_interface/backward.svg",
         text: "",
         bgOpacity: 0.0,
         hoverBgOpacity: 0.0,

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