From 529267972be3e776ebefd25420284c5f5d74e8cf Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Thu, 23 May 2024 13:48:28 +0300
Subject: [PATCH] Android: cleanup AndroidManifest.xml files in examples
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I6b0a11ace348891da7ed16dd9039b807902cb828
Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
---
 .../platform/androidnotifier/android/AndroidManifest.xml     | 5 -----
 .../examples/corelib/permissions/android/AndroidManifest.xml | 3 +--
 tests/manual/permissions/android/AndroidManifest.xml         | 3 +--
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/examples/corelib/platform/androidnotifier/android/AndroidManifest.xml b/examples/corelib/platform/androidnotifier/android/AndroidManifest.xml
index 778028a5667..1d3cf1325b8 100644
--- a/examples/corelib/platform/androidnotifier/android/AndroidManifest.xml
+++ b/examples/corelib/platform/androidnotifier/android/AndroidManifest.xml
@@ -26,7 +26,6 @@
         <activity
             android:name="org.qtproject.qt.android.bindings.QtActivity"
             android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density"
-            android:label="Qt Notifier"
             android:launchMode="singleTop"
             android:screenOrientation="unspecified"
             android:exported="true">
@@ -38,10 +37,6 @@
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
-
-            <meta-data
-                android:name="android.app.background_running"
-                android:value="false"/>
         </activity>
     </application>
 </manifest>
diff --git a/tests/manual/examples/corelib/permissions/android/AndroidManifest.xml b/tests/manual/examples/corelib/permissions/android/AndroidManifest.xml
index ec25a929ae8..baf025d4bb9 100644
--- a/tests/manual/examples/corelib/permissions/android/AndroidManifest.xml
+++ b/tests/manual/examples/corelib/permissions/android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.qtproject.example"
+    package="org.qtproject.example.permissions"
     android:installLocation="auto"
     android:versionCode="-- %%INSERT_VERSION_CODE%% --"
     android:versionName="-- %%INSERT_VERSION_NAME%% --">
@@ -35,7 +35,6 @@
         <activity
             android:name="org.qtproject.qt.android.bindings.QtActivity"
             android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density"
-            android:label="-- %%INSERT_APP_NAME%% --"
             android:launchMode="singleTop"
             android:screenOrientation="unspecified"
             android:exported="true">
diff --git a/tests/manual/permissions/android/AndroidManifest.xml b/tests/manual/permissions/android/AndroidManifest.xml
index 041c920ad1a..db577e6c274 100644
--- a/tests/manual/permissions/android/AndroidManifest.xml
+++ b/tests/manual/permissions/android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.qtproject.example"
+    package="org.qtproject.example.tst_manual_permissions"
     android:installLocation="auto"
     android:versionCode="-- %%INSERT_VERSION_CODE%% --"
     android:versionName="-- %%INSERT_VERSION_NAME%% --">
@@ -31,7 +31,6 @@
         <activity
             android:name="org.qtproject.qt.android.bindings.QtActivity"
             android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density"
-            android:label="-- %%INSERT_APP_NAME%% --"
             android:launchMode="singleTop"
             android:screenOrientation="unspecified"
             android:exported="true">