Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
de03dadc
Commit
de03dadc
authored
Aug 07, 2020
by
Remek Zajac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow custom AndroidManifest.xml and icons
parent
801b7e52
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
107 additions
and
1 deletion
+107
-1
android.pri
android.pri
+18
-1
AndroidManifest.xml
custom-example/android/AndroidManifest.xml
+84
-0
icon.png
custom-example/android/res/drawable-ldpi/icon.png
+0
-0
CustomQGCActivity.java
...roid/src/org/custom/qgroundcontrol/CustomQGCActivity.java
+5
-0
No files found.
android.pri
View file @
de03dadc
include($$PWD/libs/qtandroidserialport/src/qtandroidserialport.pri)
message("Adding Serial Java Classes")
QT += androidextras
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
exists($$PWD/custom/android) {
message("Merging $$PWD/custom/android/ -> $$PWD/android/")
ANDROID_PACKAGE_SOURCE_DIR = $$OUT_PWD/ANDROID_PACKAGE_SOURCE_DIR
system($$QMAKE_MKDIR $$ANDROID_PACKAGE_SOURCE_DIR)
system($$QMAKE_COPY_DIR $$PWD/android/* $$OUT_PWD/ANDROID_PACKAGE_SOURCE_DIR)
system($$QMAKE_COPY_DIR $$PWD/custom/android/* $$OUT_PWD/ANDROID_PACKAGE_SOURCE_DIR)
}
exists($$PWD/custom/android/AndroidManifest.xml) {
OTHER_FILES += \
$$PWD/custom/android/AndroidManifest.xml
} else {
OTHER_FILES += \
$$PWD/android/AndroidManifest.xml
}
OTHER_FILES += \
$$PWD/android/AndroidManifest.xml \
$$PWD/android/res/xml/device_filter.xml \
$$PWD/android/src/com/hoho/android/usbserial/driver/CdcAcmSerialDriver.java \
$$PWD/android/src/com/hoho/android/usbserial/driver/CommonUsbSerialDriver.java \
...
...
custom-example/android/AndroidManifest.xml
0 → 100644
View file @
de03dadc
<?xml version="1.0"?>
<manifest
package=
"org.custom.qgroundcontrol"
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:versionName=
"-- %%INSERT_VERSION_NAME%% --"
android:versionCode=
"-- %%INSERT_VERSION_CODE%% --"
android:installLocation=
"auto"
>
<application
android:hardwareAccelerated=
"true"
android:name=
"org.qtproject.qt5.android.bindings.QtApplication"
android:label=
"-- %%INSERT_APP_NAME%% --"
android:icon=
"@drawable/icon"
>
<activity
android:configChanges=
"orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
android:name=
".CustomQGCActivity"
android:label=
"-- %%INSERT_APP_NAME%% --"
android:screenOrientation=
"sensorLandscape"
android:launchMode=
"singleTask"
android:keepScreenOn=
"true"
>
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
<action
android:name=
"android.hardware.usb.action.USB_DEVICE_ATTACHED"
/>
<action
android:name=
"android.hardware.usb.action.USB_DEVICE_DETACHED"
/>
<action
android:name=
"android.bluetooth.device.action.ACL_CONNECTED"
/>
<action
android:name=
"android.bluetooth.device.action.ACL_DISCONNECTED"
/>
<action
android:name=
"android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
/>
</intent-filter>
<meta-data
android:resource=
"@xml/device_filter"
android:name=
"android.hardware.usb.action.USB_DEVICE_ATTACHED"
/>
<meta-data
android:resource=
"@xml/device_filter"
android:name=
"android.hardware.usb.action.USB_DEVICE_DETACHED"
/>
<meta-data
android:resource=
"@xml/device_filter"
android:name=
"android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
/>
<!-- Rest of Standard Manifest -->
<meta-data
android:name=
"android.app.lib_name"
android:value=
"-- %%INSERT_APP_LIB_NAME%% --"
/>
<meta-data
android:name=
"android.app.qt_sources_resource_id"
android:resource=
"@array/qt_sources"
/>
<meta-data
android:name=
"android.app.repository"
android:value=
"default"
/>
<meta-data
android:name=
"android.app.qt_libs_resource_id"
android:resource=
"@array/qt_libs"
/>
<meta-data
android:name=
"android.app.bundled_libs_resource_id"
android:resource=
"@array/bundled_libs"
/>
<!-- Deploy Qt libs as part of package -->
<meta-data
android:name=
"android.app.bundle_local_qt_libs"
android:value=
"-- %%BUNDLE_LOCAL_QT_LIBS%% --"
/>
<meta-data
android:name=
"android.app.bundled_in_lib_resource_id"
android:resource=
"@array/bundled_in_lib"
/>
<meta-data
android:name=
"android.app.bundled_in_assets_resource_id"
android:resource=
"@array/bundled_in_assets"
/>
<!-- Run with local libs -->
<meta-data
android:name=
"android.app.use_local_qt_libs"
android:value=
"-- %%USE_LOCAL_QT_LIBS%% --"
/>
<meta-data
android:name=
"android.app.libs_prefix"
android:value=
"/data/local/tmp/qt/"
/>
<meta-data
android:name=
"android.app.load_local_libs"
android:value=
"-- %%INSERT_LOCAL_LIBS%% --"
/>
<meta-data
android:name=
"android.app.load_local_jars"
android:value=
"-- %%INSERT_LOCAL_JARS%% --"
/>
<meta-data
android:name=
"android.app.static_init_classes"
android:value=
"-- %%INSERT_INIT_CLASSES%% --"
/>
<!-- Messages maps -->
<meta-data
android:value=
"@string/ministro_not_found_msg"
android:name=
"android.app.ministro_not_found_msg"
/>
<meta-data
android:value=
"@string/ministro_needed_msg"
android:name=
"android.app.ministro_needed_msg"
/>
<meta-data
android:value=
"@string/fatal_error_msg"
android:name=
"android.app.fatal_error_msg"
/>
<!-- Messages maps -->
<!-- Splash screen -->
<!--
<meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/>
-->
<!-- Splash screen -->
<!-- Background running -->
<!-- Warning: changing this value to true may cause unexpected crashes if the
application still try to draw after
"applicationStateChanged(Qt::ApplicationSuspended)"
signal is sent! -->
<meta-data
android:name=
"android.app.background_running"
android:value=
"false"
/>
<!-- Background running -->
</activity>
</application>
<uses-sdk
android:minSdkVersion=
"16"
android:targetSdkVersion=
"28"
/>
<!-- Needed to keep working while 'asleep' -->
<uses-permission
android:name=
"android.permission.WAKE_LOCK"
/>
<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
Remove the comment if you do not require these default permissions. -->
<!-- %%INSERT_PERMISSIONS -->
<!-- Support devices without USB host mode since there are other connection types -->
<uses-feature
android:name=
"android.hardware.usb.host"
android:required=
"false"
/>
<!-- Support devices without Bluetooth since there are other connection types -->
<uses-feature
android:name=
"android.hardware.bluetooth"
android:required=
"false"
/>
<!-- Support devices that don't have location services -->
<uses-feature
android:name=
"android.hardware.location.gps"
android:required=
"false"
/>
<uses-feature
android:name=
"android.hardware.location.network"
android:required=
"false"
/>
<uses-feature
android:name=
"android.hardware.location"
android:required=
"false"
/>
<uses-feature
android:name=
"android.hardware.usb.accessory"
/>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.WRITE_INTERNAL_STORAGE"
/>
<uses-permission
android:name=
"android.permission.WRITE_EXTERNAL_STORAGE"
/>
<!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
Remove the comment if you do not require these default features. -->
<!-- %%INSERT_FEATURES -->
</manifest>
custom-example/android/res/drawable-ldpi/icon.png
0 → 100644
View file @
de03dadc
20 KB
custom-example/android/src/org/custom/qgroundcontrol/CustomQGCActivity.java
0 → 100644
View file @
de03dadc
package
org
.
custom
.
qgroundcontrol
;
import
org.mavlink.qgroundcontrol.QGCActivity
;
public
class
CustomQGCActivity
extends
QGCActivity
{}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment