From 6e106156666ac2c107286a5bfd519474620cb8f9 Mon Sep 17 00:00:00 2001 From: Venkatesh Shukla Date: Mon, 23 Jun 2014 17:18:17 +0530 Subject: Template for subsurface android package For modifications to the final source code of built android package such as permission additions and inclusion of xml and java files, it is necessary to maintain a template. The template is copied without any modifications on top of qt android-template before building subsurface libraries. Refer: http://qt-project.org/doc/qt-5/deployment-android.html#qmake-variables Files that are required to be directly copied to android package would be included in directory android. Icons for subsurface on android and string.xml are included. Signed-off-by: Venkatesh Shukla Signed-off-by: Anton Lundin Signed-off-by: Dirk Hohndel --- .gitignore | 1 + android/AndroidManifest.xml | 108 +++++++++++++++++++++++ android/res/drawable-hdpi/subsurface_icon.png | Bin 0 -> 20958 bytes android/res/drawable-mdpi/subsurface_icon.png | Bin 0 -> 9402 bytes android/res/drawable-xhdpi/subsurface_icon.png | Bin 0 -> 37139 bytes android/res/drawable-xxhdpi/subsurface_icon.png | Bin 0 -> 83344 bytes android/res/drawable-xxxhdpi/subsurface_icon.png | Bin 0 -> 148010 bytes android/res/values/strings.xml | 8 ++ subsurface-install.pri | 2 + subsurface.pro | 6 ++ 10 files changed, 125 insertions(+) create mode 100644 android/AndroidManifest.xml create mode 100644 android/res/drawable-hdpi/subsurface_icon.png create mode 100644 android/res/drawable-mdpi/subsurface_icon.png create mode 100644 android/res/drawable-xhdpi/subsurface_icon.png create mode 100644 android/res/drawable-xxhdpi/subsurface_icon.png create mode 100644 android/res/drawable-xxxhdpi/subsurface_icon.png create mode 100644 android/res/values/strings.xml diff --git a/.gitignore b/.gitignore index 927228628..8b921ab5d 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ Makefile subsurface.pro.user* Subsurface.app .DS_Store +!android/**/*.xml diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml new file mode 100644 index 000000000..6d7b24db2 --- /dev/null +++ b/android/AndroidManifest.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/res/drawable-hdpi/subsurface_icon.png b/android/res/drawable-hdpi/subsurface_icon.png new file mode 100644 index 000000000..659ee2619 Binary files /dev/null and b/android/res/drawable-hdpi/subsurface_icon.png differ diff --git a/android/res/drawable-mdpi/subsurface_icon.png b/android/res/drawable-mdpi/subsurface_icon.png new file mode 100644 index 000000000..57465be23 Binary files /dev/null and b/android/res/drawable-mdpi/subsurface_icon.png differ diff --git a/android/res/drawable-xhdpi/subsurface_icon.png b/android/res/drawable-xhdpi/subsurface_icon.png new file mode 100644 index 000000000..0d2e2e8cb Binary files /dev/null and b/android/res/drawable-xhdpi/subsurface_icon.png differ diff --git a/android/res/drawable-xxhdpi/subsurface_icon.png b/android/res/drawable-xxhdpi/subsurface_icon.png new file mode 100644 index 000000000..9a0a470a6 Binary files /dev/null and b/android/res/drawable-xxhdpi/subsurface_icon.png differ diff --git a/android/res/drawable-xxxhdpi/subsurface_icon.png b/android/res/drawable-xxxhdpi/subsurface_icon.png new file mode 100644 index 000000000..00b0a13c9 Binary files /dev/null and b/android/res/drawable-xxxhdpi/subsurface_icon.png differ diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml new file mode 100644 index 000000000..2a79f113e --- /dev/null +++ b/android/res/values/strings.xml @@ -0,0 +1,8 @@ + + + Subsurface + + Can\'t find Ministro service.\nThe application can\'t start. + This application requires Ministro service. Would you like to install it? + Your application encountered a fatal error and cannot continue. + diff --git a/subsurface-install.pri b/subsurface-install.pri index db1c0ff6a..0fec89d32 100644 --- a/subsurface-install.pri +++ b/subsurface-install.pri @@ -130,6 +130,8 @@ mac { } else: android { # Android install rules QMAKE_BUNDLE_DATA += translation qttranslation + # Android template directory + ANDROID_PACKAGE_SOURCE_DIR = $$OUT_PWD/android } else { # Linux install rules # On Linux, we can count on packagers doing the right thing diff --git a/subsurface.pro b/subsurface.pro index 1172020c5..86d19cd71 100644 --- a/subsurface.pro +++ b/subsurface.pro @@ -263,6 +263,12 @@ theme.commands += $(CHK_DIR_EXISTS) $$OUT_PWD/theme || $(COPY_DIR) $$PWD/theme $ all.depends += theme QMAKE_EXTRA_TARGETS += theme +android { + android.commands += $(CHK_DIR_EXISTS) $$OUT_PWD/android || $(COPY_DIR) $$PWD/android $$OUT_PWD + all.depends += android + QMAKE_EXTRA_TARGETS += android +} + DESKTOP_FILE = subsurface.desktop mac: ICON = packaging/macosx/Subsurface.icns else: ICON = subsurface-icon.svg -- cgit v1.2.3-70-g09d2