Move android screen orientation into platform settings

Source/Editor/Cooker/Platform/Android/AndroidPlatformTools.cpp

@@ -174,19 +174,19 @@ bool AndroidPlatformTools::OnPostProcess(CookingData& data)
     String orientation = String("fullSensor");
     switch (defaultOrienation)
     {
-    case AndroidScreenOrientation::Portrait:
+    case AndroidPlatformSettings::ScreenOrientation::Portrait:
         orientation = String("portrait");
         break;
-    case AndroidScreenOrientation::PortraitReverse:
+    case AndroidPlatformSettings::ScreenOrientation::PortraitReverse:
         orientation = String("reversePortrait");
         break;
-    case AndroidScreenOrientation::LandscapeRight:
+    case AndroidPlatformSettings::ScreenOrientation::LandscapeRight:
         orientation = String("landscape");
         break;
-    case AndroidScreenOrientation::LandscapeLeft:
+    case AndroidPlatformSettings::ScreenOrientation::LandscapeLeft:
         orientation = String("reverseLandscape");
         break;
-    case AndroidScreenOrientation::AutoRotation:
+    case AndroidPlatformSettings::ScreenOrientation::AutoRotation:
         orientation = String("fullSensor");
         break;
     default:

Source/Engine/Platform/Android/AndroidPlatformSettings.h

@@ -9,37 +9,6 @@
 
 class Texture;
 
-/// <summary>
-/// Android screen orientation options.
-/// </summary>
-API_ENUM() enum class FLAXENGINE_API AndroidScreenOrientation 
-{
-    /// <summary>
-    /// "portrait" mode
-    /// </summary>
-    Portrait,
-
-    /// <summary>
-    /// "reversePortrait" mode
-    /// </summary>
-    PortraitReverse,
-
-    /// <summary>
-    /// "landscape" mode
-    /// </summary>
-    LandscapeRight,
-
-    /// <summary>
-    /// "reverseLandscape" mode
-    /// </summary>
-    LandscapeLeft,
-
-    /// <summary>
-    /// "fullSensor" mode
-    /// </summary>
-    AutoRotation,
-};
-
 /// <summary>
 /// Android platform settings.
 /// </summary>
@@ -48,6 +17,37 @@ API_CLASS(sealed, Namespace="FlaxEditor.Content.Settings") class FLAXENGINE_API
     DECLARE_SCRIPTING_TYPE_MINIMAL(AndroidPlatformSettings);
     API_AUTO_SERIALIZATION();
 
+    /// <summary>
+    /// Android screen orientation options.
+    /// </summary>
+    API_ENUM() enum class FLAXENGINE_API ScreenOrientation
+    {
+        /// <summary>
+        /// "portrait" mode
+        /// </summary>
+        Portrait,
+
+        /// <summary>
+        /// "reversePortrait" mode
+        /// </summary>
+        PortraitReverse,
+
+        /// <summary>
+        /// "landscape" mode
+        /// </summary>
+        LandscapeRight,
+
+        /// <summary>
+        /// "reverseLandscape" mode
+        /// </summary>
+        LandscapeLeft,
+
+        /// <summary>
+        /// "fullSensor" mode
+        /// </summary>
+        AutoRotation,
+    };
+
     /// <summary>
     /// The application package name (eg. com.company.product). Custom tokens: ${PROJECT_NAME}, ${COMPANY_NAME}.
     /// </summary>
@@ -64,7 +64,7 @@ API_CLASS(sealed, Namespace="FlaxEditor.Content.Settings") class FLAXENGINE_API
     /// The default screen orientation.
     /// </summary>
     API_FIELD(Attributes = "EditorOrder(110), EditorDisplay(\"General\")")
-    AndroidScreenOrientation DefaultOrientation = AndroidScreenOrientation::AutoRotation;
+    ScreenOrientation DefaultOrientation = ScreenOrientation::AutoRotation;
 
     /// <summary>
     /// Custom icon texture to use for the application (overrides the default one).