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.

Pick-to: 6.7
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>

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

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

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>

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>