From d66874f13c334587c1597e4eb22b16cd27fd7a27 Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Sat, 16 Dec 2023 13:50:51 +0200
Subject: [PATCH] Android: set default style extraction to minimal

The default value in the default manifest has been for few
releases, set as minimal, and since Widgets Android style
is not fully supported anymore, we can set this to default
to minimal under the hood as well to avoid needing to always
explicitly needing to set it to minimal.

Change-Id: Id0b2134c572694be1e190347ff75f51ade65f0c4
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
(cherry picked from commit ee4f91fa50fa470b4891318750bd7aad5e508124)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../jar/src/org/qtproject/qt/android/ExtractStyle.java     | 7 +++++--
 src/android/templates/AndroidManifest.xml                  | 4 ----
 .../corelib/permissions/android/AndroidManifest.xml        | 4 ----
 tests/manual/permissions/android/AndroidManifest.xml       | 4 ----
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java b/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java
index b5604d4c479..0f146c1f45c 100644
--- a/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java
+++ b/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java
@@ -154,11 +154,14 @@ class ExtractStyle {
         String dataDir = activity.getApplicationInfo().dataDir;
         m_stylePath = dataDir + "/qt-reserved-files/android-style/" + dpi + "/";
 
+        if (extractOption.isEmpty())
+            extractOption = "minimal";
+
         if (!extractOption.equals("default") && !extractOption.equals("full")
                 && !extractOption.equals("minimal") && !extractOption.equals("none")) {
             Log.e(QtTAG, "Invalid extract_android_style option \"" + extractOption
-                    + "\", defaulting to \"default\"");
-            extractOption = "default";
+                    + "\", defaulting to \"minimal\"");
+            extractOption = "minimal";
         }
 
         // QTBUG-69810: The extraction code will trigger compatibility warnings on Android
diff --git a/src/android/templates/AndroidManifest.xml b/src/android/templates/AndroidManifest.xml
index b309db74772..21ceaacc2e4 100644
--- a/src/android/templates/AndroidManifest.xml
+++ b/src/android/templates/AndroidManifest.xml
@@ -36,10 +36,6 @@
           <meta-data
                 android:name="android.app.arguments"
                 android:value="-- %%INSERT_APP_ARGUMENTS%% --" />
-
-            <meta-data
-                android:name="android.app.extract_android_style"
-                android:value="minimal" />
         </activity>
 
         <provider
diff --git a/tests/manual/examples/corelib/permissions/android/AndroidManifest.xml b/tests/manual/examples/corelib/permissions/android/AndroidManifest.xml
index 44ed54390a9..041c920ad1a 100644
--- a/tests/manual/examples/corelib/permissions/android/AndroidManifest.xml
+++ b/tests/manual/examples/corelib/permissions/android/AndroidManifest.xml
@@ -43,10 +43,6 @@
           <meta-data
                 android:name="android.app.lib_name"
                 android:value="-- %%INSERT_APP_LIB_NAME%% --" />
-
-            <meta-data
-                android:name="android.app.extract_android_style"
-                android:value="minimal" />
         </activity>
     </application>
 </manifest>
diff --git a/tests/manual/permissions/android/AndroidManifest.xml b/tests/manual/permissions/android/AndroidManifest.xml
index 44ed54390a9..041c920ad1a 100644
--- a/tests/manual/permissions/android/AndroidManifest.xml
+++ b/tests/manual/permissions/android/AndroidManifest.xml
@@ -43,10 +43,6 @@
           <meta-data
                 android:name="android.app.lib_name"
                 android:value="-- %%INSERT_APP_LIB_NAME%% --" />
-
-            <meta-data
-                android:name="android.app.extract_android_style"
-                android:value="minimal" />
         </activity>
     </application>
 </manifest>