X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=android%2FAndroidManifest.xml;h=968b7f5ab29aa2053c58493038908abb6841e671;hb=2099158e1e3a95c03d8d393921d4171f9bd1379c;hp=3609c569375590d9da5c816a26bb9a218ddf52ff;hpb=a4ef39937e784acf7b8a1039bbd353b559c40233;p=pulseview.git

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 3609c569..968b7f5a 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,50 +1,68 @@
 <?xml version='1.0' encoding='utf-8'?>
+<!--
+   This file is part of the PulseView project.
+
+   Copyright (C) 2014 Marcus Comstedt <marcus@mc.pp.se>
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		package="org.sigrok.pulseview" 
-		android:versionName="0.2.0"
-		android:versionCode="20"
+		package="org.sigrok.pulseview"
+		android:versionName="0.4.0"
+		android:versionCode="40"
 		android:installLocation="auto">
-    <application android:hardwareAccelerated="true"
+	<application android:hardwareAccelerated="true"
 		 android:name="org.sigrok.pulseview.PulseViewApplication"
 		 android:label="@string/pv_app_name"
 		 android:icon="@drawable/logo">
-        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
-                  android:name="org.sigrok.pulseview.PulseViewActivity"
-                  android:label="@string/pv_app_name"
-                  android:screenOrientation="unspecified"
-                  android:launchMode="singleTop">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-            <meta-data android:name="android.app.lib_name" android:value="pulseview"/>
-            <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="0"/>
-            <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="0"/>
-            <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="plugins/platforms/android/libqtforandroid.so"/>
-            <meta-data android:name="android.app.load_local_jars" android:value="jar/QtAndroid.jar:jar/QtAndroidAccessibility.jar:jar/QtAndroid-bundled.jar:jar/QtAndroidAccessibility-bundled.jar"/>
-            <meta-data android:name="android.app.static_init_classes" android:value=""/>
-            <!--  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 -->
-        </activity>
-    </application>
-    <uses-sdk android:minSdkVersion="12" android:targetSdkVersion="14"/>
-    <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+		<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
+				android:name="org.sigrok.pulseview.PulseViewActivity"
+				android:label="@string/pv_app_name"
+				android:screenOrientation="unspecified"
+				android:launchMode="singleTop">
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN"/>
+				<category android:name="android.intent.category.LAUNCHER"/>
+			</intent-filter>
+			<meta-data android:name="android.app.lib_name" android:value="pulseview"/>
+			<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="1"/>
+			<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="1"/>
+			<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="plugins/platforms/android/libqtforandroid.so"/>
+			<meta-data android:name="android.app.load_local_jars" android:value="jar/QtAndroid.jar:jar/QtAndroidAccessibility.jar:jar/QtAndroid-bundled.jar:jar/QtAndroidAccessibility-bundled.jar"/>
+			<meta-data android:name="android.app.static_init_classes" android:value=""/>
+			<!-- 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 -->
+		</activity>
+	</application>
+	<uses-sdk android:minSdkVersion="12" android:targetSdkVersion="14"/>
+	<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 </manifest>