Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 04:07:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #13261 from gcalero/android_signing_and_remove_audiobar

Browse source 
RC68: Android signing and remove audiobar
This commit is contained in:
John Conklin II 2018-05-30 17:14:46 -07:00 committed by GitHub
commit f5a0f3d907
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 44 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
android/app/build.gradle
View file

@ -27,6 +27,14 @@ android {
'-DDISABLE_KTX_CACHE=OFF'
}
}
signingConfigs {
release {
storeFile project.hasProperty("HIFI_ANDROID_KEYSTORE") ? file(HIFI_ANDROID_KEYSTORE) : null
storePassword project.hasProperty("HIFI_ANDROID_KEYSTORE_PASSWORD") ? HIFI_ANDROID_KEYSTORE_PASSWORD : ''
keyAlias project.hasProperty("HIFI_ANDROID_KEY_ALIAS") ? HIFI_ANDROID_KEY_ALIAS : ''
keyPassword project.hasProperty("HIFI_ANDROID_KEY_PASSWORD") ? HIFI_ANDROID_KEY_PASSWORD : ''
}
}
}
compileOptions {
@ -38,6 +46,10 @@ android {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig project.hasProperty("HIFI_ANDROID_KEYSTORE") &&
project.hasProperty("HIFI_ANDROID_KEYSTORE_PASSWORD") &&
project.hasProperty("HIFI_ANDROID_KEY_ALIAS") &&
project.hasProperty("HIFI_ANDROID_KEY_PASSWORD")? signingConfigs.release : null
}
}

6
android/app/src/main/AndroidManifest.xml
View file

@ -49,12 +49,6 @@
android:label="@string/app_name"
android:launchMode="singleTop"
>
<intent-filter>
<category android:name="com.google.intent.category.DAYDREAM"/>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
<meta-data android:name="android.app.lib_name" android:value="native-lib"/>
<meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
<meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>

2
interface/src/Application.cpp
View file

@ -3011,9 +3011,11 @@ void Application::onDesktopRootItemCreated(QQuickItem* rootItem) {
auto surfaceContext = DependencyManager::get<OffscreenUi>()->getSurfaceContext();
surfaceContext->setContextProperty("Stats", Stats::getInstance());
#if !defined(Q_OS_ANDROID)
auto offscreenUi = DependencyManager::get<OffscreenUi>();
auto qml = PathUtils::qmlUrl("AvatarInputsBar.qml");
offscreenUi->show(qml, "AvatarInputsBar");
#endif
}
void Application::updateCamera(RenderArgs& renderArgs, float deltaTime) {

8
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -237,6 +237,14 @@ QString ScriptEngine::getContext() const {
return "unknown";
}
bool ScriptEngine::isDebugMode() const {
#if defined(DEBUG)
return true;
#else
return false;
#endif
}
ScriptEngine::~ScriptEngine() {
auto scriptEngines = DependencyManager::get<ScriptEngines>();
if (scriptEngines) {

6
libraries/script-engine/src/ScriptEngine.h
View file

@ -232,6 +232,12 @@ public:
*/
Q_INVOKABLE bool isClientScript() const { return _context == CLIENT_SCRIPT; }
/**jsdoc
* @function Script.isDebugMode
* @returns {boolean}
*/
Q_INVOKABLE bool isDebugMode() const;
/**jsdoc
* @function Script.isEntityClientScript
* @returns {boolean}

17
scripts/+android/defaultScripts.js
View file

@ -16,8 +16,7 @@ var DEFAULT_SCRIPTS_COMBINED = [
"system/+android/touchscreenvirtualpad.js",
"system/+android/actionbar.js",
"system/+android/audio.js" ,
"system/+android/modes.js",
"system/+android/stats.js"/*,
"system/+android/modes.js"/*,
"system/away.js",
"system/controllers/controllerDisplayManager.js",
"system/controllers/handControllerGrabAndroid.js",
@ -33,6 +32,10 @@ var DEFAULT_SCRIPTS_COMBINED = [
"developer/debugging/debugAndroidMouse.js"*/
];
var DEBUG_SCRIPTS = [
"system/+android/stats.js"
];
var DEFAULT_SCRIPTS_SEPARATE = [ ];
// add a menu item for debugging
@ -70,6 +73,11 @@ function runDefaultsTogether() {
for (var i in DEFAULT_SCRIPTS_COMBINED) {
Script.include(DEFAULT_SCRIPTS_COMBINED[i]);
}
if (Script.isDebugMode()) {
for (var i in DEBUG_SCRIPTS) {
Script.include(DEBUG_SCRIPTS[i]);
}
}
loadSeparateDefaults();
}
@ -77,6 +85,11 @@ function runDefaultsSeparately() {
for (var i in DEFAULT_SCRIPTS_COMBINED) {
Script.load(DEFAULT_SCRIPTS_COMBINED[i]);
}
if (Script.isDebugMode()) {
for (var i in DEBUG_SCRIPTS) {
Script.load(DEBUG_SCRIPTS[i]);
}
}
loadSeparateDefaults();
}

2
scripts/system/+android/stats.js
View file

@ -30,7 +30,7 @@ function init() {
text: "STATS"
});
statsButton.clicked.connect(function() {
Menu.triggerOption("Stats");
Menu.triggerOption("Show Statistics");
});
}