Merge pull request #9089 from JosJuice/android-orientation-setting

Android: Move orientation setting to main settings screen

Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml

@@ -91,11 +91,6 @@
                 android:text="@string/emulation_refresh_wiimotes"
                 style="@style/InGameMenuOption"/>
 
-            <Button
-                android:id="@+id/menu_screen_orientation"
-                android:text="@string/emulation_screen_orientation"
-                style="@style/InGameMenuOption"/>
-
             <Button
                 android:id="@+id/menu_change_disc"
                 android:text="@string/emulation_change_disc"

Source/Android/app/src/main/res/values/strings.xml

@@ -163,6 +163,7 @@
 
     <!-- Interface Preference Fragment -->
     <string name="interface_submenu">Interface</string>
+    <string name="emulation_screen_orientation">Screen Orientation During Emulation</string>
     <string name="panic_handlers">Use Panic Handlers</string>
     <string name="panic_handlers_description">Show a message box when a potentially serious error has occurred. Disabling this may avoid annoying and non-fatal messages, but it may result in major crashes having no explanation at all.</string>
     <string name="osd_messages">Show On-Screen Display Messages</string>
@@ -402,7 +403,6 @@ It can efficiently compress both junk data and encrypted Wii data.
     <string name="emulation_ir_group">Touch IR Pointer</string>
     <string name="emulation_ir_sensitivity">IR Sensitivity</string>
     <string name="emulation_choose_doubletap">Double tap button</string>
-    <string name="emulation_screen_orientation">Screen Orientation</string>
     <string name="emulation_motion_controls">Motion Controls</string>
 
     <!-- GC Adapter Menu-->