mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Android build: remove references to ministro stuff

Browse source 
First, Ministro (an app to help installing Qt dependencies on
the mobile platform) is not needed in Subsurface context, as all
dependencies are part of the distribution. Secondly, it breaks the
build as the strings (removed here) are also defined in Qt, and
apparently the Gradle build is detecting this double define.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2017-05-25 19:57:06 +02:00 • committed by Dirk Hohndel
parent 1df4b6c11b
commit 3d8c0b2771
4 changed files with 0 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
android-mobile/AndroidManifest.xml
View file

@ -65,18 +65,6 @@
<meta-data
android:name="android.app.static_init_classes"
android:value="-- %%INSERT_INIT_CLASSES%% --" />
<!-- Messages maps -->
<meta-data
android:name="android.app.ministro_not_found_msg"
android:value="@string/ministro_not_found_msg" />
<meta-data
android:name="android.app.ministro_needed_msg"
android:value="@string/ministro_needed_msg" />
<meta-data
android:name="android.app.fatal_error_msg"
android:value="@string/fatal_error_msg" />
<!-- Messages maps -->
<!-- Splash screen -->
<!-- <meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/subsurface_mobile_splash" /> -->

4
android-mobile/res/values/strings.xml
View file

@ -1,8 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="app_name">Subsurface-mobile</string>
<string name="ministro_not_found_msg">Can\'t find Ministro service.\nThe application can\'t start.</string>
<string name="ministro_needed_msg">This application requires Ministro service. Would you like to install it?</string>
<string name="fatal_error_msg">Your application encountered a fatal error and cannot continue.</string>
</resources>

12
android/AndroidManifest.xml
View file

@ -63,18 +63,6 @@
<meta-data
android:name="android.app.static_init_classes"
android:value="-- %%INSERT_INIT_CLASSES%% --" />
<!-- Messages maps -->
<meta-data
android:name="android.app.ministro_not_found_msg"
android:value="@string/ministro_not_found_msg" />
<meta-data
android:name="android.app.ministro_needed_msg"
android:value="@string/ministro_needed_msg" />
<meta-data
android:name="android.app.fatal_error_msg"
android:value="@string/fatal_error_msg" />
<!-- Messages maps -->
<!-- Splash screen -->
<!--

4
android/res/values/strings.xml
View file

@ -1,8 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="app_name">Subsurface-Divelog</string>
<string name="ministro_not_found_msg">Can\'t find Ministro service.\nThe application can\'t start.</string>
<string name="ministro_needed_msg">This application requires Ministro service. Would you like to install it?</string>
<string name="fatal_error_msg">Your application encountered a fatal error and cannot continue.</string>
</resources>