From f30d70049ca456dac505f9a9028bec5875cc0bab Mon Sep 17 00:00:00 2001
From: reuk <reuk@users.noreply.github.com>
Date: Tue, 29 Apr 2025 20:25:03 +0100
Subject: [PATCH] Projucer (Android): Avoid setting orientation key when
 unspecified by user

---
 .../Builds/Android/app/src/main/AndroidManifest.xml   |  3 +--
 .../Builds/Android/app/src/main/AndroidManifest.xml   |  3 +--
 .../Builds/Android/app/src/main/AndroidManifest.xml   |  3 +--
 .../Builds/Android/app/src/main/AndroidManifest.xml   |  3 +--
 .../ProjectSaving/jucer_ProjectExport_Android.h       | 11 +++++------
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/examples/DemoRunner/Builds/Android/app/src/main/AndroidManifest.xml b/examples/DemoRunner/Builds/Android/app/src/main/AndroidManifest.xml
index 7b396124e4..3c208eb49c 100644
--- a/examples/DemoRunner/Builds/Android/app/src/main/AndroidManifest.xml
+++ b/examples/DemoRunner/Builds/Android/app/src/main/AndroidManifest.xml
@@ -24,8 +24,7 @@
   <application android:label="@string/app_name" android:name="com.rmsl.juce.JuceApp" android:icon="@drawable/icon" android:hardwareAccelerated="false">
     <receiver android:name="com.rmsl.juce.Receiver" android:exported="false"/>
     <activity android:name="com.rmsl.juce.JuceActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|navigation|smallestScreenSize|screenLayout"
-              android:screenOrientation="unspecified" android:launchMode="singleTask" android:hardwareAccelerated="true"
-              android:exported="true">
+              android:launchMode="singleTask" android:hardwareAccelerated="true" android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
         <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/extras/AudioPerformanceTest/Builds/Android/app/src/main/AndroidManifest.xml b/extras/AudioPerformanceTest/Builds/Android/app/src/main/AndroidManifest.xml
index d2a5f20dc3..0dc5e12a83 100644
--- a/extras/AudioPerformanceTest/Builds/Android/app/src/main/AndroidManifest.xml
+++ b/extras/AudioPerformanceTest/Builds/Android/app/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
   <application android:label="@string/app_name" android:name="com.rmsl.juce.JuceApp" android:hardwareAccelerated="false">
     <receiver android:name="com.rmsl.juce.Receiver" android:exported="false"/>
     <activity android:name="com.rmsl.juce.JuceActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|navigation|smallestScreenSize|screenLayout"
-              android:screenOrientation="unspecified" android:launchMode="singleTask" android:hardwareAccelerated="true"
-              android:exported="true">
+              android:launchMode="singleTask" android:hardwareAccelerated="true" android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
         <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/extras/AudioPluginHost/Builds/Android/app/src/main/AndroidManifest.xml b/extras/AudioPluginHost/Builds/Android/app/src/main/AndroidManifest.xml
index 2dc4496168..600a0f9dff 100644
--- a/extras/AudioPluginHost/Builds/Android/app/src/main/AndroidManifest.xml
+++ b/extras/AudioPluginHost/Builds/Android/app/src/main/AndroidManifest.xml
@@ -23,8 +23,7 @@
   <application android:label="@string/app_name" android:name="com.rmsl.juce.JuceApp" android:icon="@drawable/icon" android:hardwareAccelerated="false">
     <receiver android:name="com.rmsl.juce.Receiver" android:exported="false"/>
     <activity android:name="com.rmsl.juce.JuceActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|navigation|smallestScreenSize|screenLayout"
-              android:screenOrientation="unspecified" android:launchMode="singleTask" android:hardwareAccelerated="true"
-              android:exported="true">
+              android:launchMode="singleTask" android:hardwareAccelerated="true" android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
         <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/extras/NetworkGraphicsDemo/Builds/Android/app/src/main/AndroidManifest.xml b/extras/NetworkGraphicsDemo/Builds/Android/app/src/main/AndroidManifest.xml
index bf9b313606..498a2d9470 100644
--- a/extras/NetworkGraphicsDemo/Builds/Android/app/src/main/AndroidManifest.xml
+++ b/extras/NetworkGraphicsDemo/Builds/Android/app/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
   <application android:label="@string/app_name" android:name="com.rmsl.juce.JuceApp" android:icon="@drawable/icon" android:hardwareAccelerated="false">
     <receiver android:name="com.rmsl.juce.Receiver" android:exported="false"/>
     <activity android:name="com.rmsl.juce.JuceActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|navigation|smallestScreenSize|screenLayout"
-              android:screenOrientation="unspecified" android:launchMode="singleTask" android:hardwareAccelerated="true"
-              android:exported="true">
+              android:launchMode="singleTask" android:hardwareAccelerated="true" android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
         <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h
index eb3fa20757..c1ecf2e2c9 100644
--- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h
+++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h
@@ -1848,13 +1848,12 @@ private:
         if (! act->hasAttribute ("android:configChanges"))
             act->setAttribute ("android:configChanges", "keyboard|keyboardHidden|orientation|screenSize|navigation|smallestScreenSize|screenLayout");
 
-        if (androidScreenOrientation.get() == "landscape")
+        if (androidScreenOrientation.get() != "unspecified")
         {
-            setAttributeIfNotPresent (*act, "android:screenOrientation", "userLandscape");
-        }
-        else
-        {
-            setAttributeIfNotPresent (*act, "android:screenOrientation", androidScreenOrientation.get());
+            setAttributeIfNotPresent (*act,
+                                      "android:screenOrientation",
+                                      androidScreenOrientation.get() == "landscape" ? "userLandscape"
+                                                                                    : androidScreenOrientation.get());
         }
 
         setAttributeIfNotPresent (*act, "android:launchMode", "singleTask");