Merge pull request #347 from lioncash/master

[Android] Minor XML adjustments.

android/phoenix/res/values/strings.xml

@@ -81,7 +81,7 @@
     <string name="ime">IME</string>
     <string name="ime_method">Set Input Method</string>
     <string name="ime_method_desc">Sets IME to be used in-game.</string>
-    <string name="config_autodetect">Enable configuration autodetect</string>
+    <string name="config_autodetect">Configuration autodetection</string>
     <string name="config_autodetect_desc">This will attempt to preconfigure various gamepads and/or IME apps that you connect.</string>
     <string name="list_autodetected">List of autodetected devices</string>
     <string name="autodetected_pads">Configuration Autodetect - Supported Pads</string>

android/phoenix/res/xml/general_preferences.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Configuration Style -->
     <PreferenceCategory android:title="@string/config_style" >
         <CheckBoxPreference
             android:defaultValue="true"
@@ -8,6 +10,7 @@
             android:title="@string/global_config" />
     </PreferenceCategory>
 
+    <!-- General -->
     <PreferenceCategory android:title="@string/general" >
         <CheckBoxPreference
             android:defaultValue="true"
@@ -20,6 +23,8 @@
             android:summary="@string/auto_save_state_desc"
             android:title="@string/auto_save_state" />
     </PreferenceCategory>
+
+    <!-- Rewinding -->
     <PreferenceCategory android:title="@string/rewinding" >
         <CheckBoxPreference
             android:defaultValue="false"

android/phoenix/res/xml/input_preferences.xml

@@ -1,22 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-   <PreferenceCategory android:title="@string/general" >
-        <ListPreference
-            android:entries="@array/back_options"
-            android:entryValues="@array/back_options_values"
-            android:defaultValue="0"
-            android:key="input_back_behavior"
-            android:summary="@string/back_behavior_desc"
-            android:title="@string/back_behavior" />
-   </PreferenceCategory>
-   
-   <PreferenceCategory android:title="@string/ime" >
-        <Preference
-            android:key="set_ime_pref"
-            android:summary="@string/ime_method_desc"
-            android:title="@string/ime_method" />
+
+    <!-- General -->
+    <PreferenceCategory android:title="@string/general" >
+         <ListPreference
+             android:entries="@array/back_options"
+             android:entryValues="@array/back_options_values"
+             android:defaultValue="0"
+             android:key="input_back_behavior"
+             android:summary="@string/back_behavior_desc"
+             android:title="@string/back_behavior" />
     </PreferenceCategory>
 
+    <!-- IME -->
+    <PreferenceCategory android:title="@string/ime" >
+         <Preference
+             android:key="set_ime_pref"
+             android:summary="@string/ime_method_desc"
+             android:title="@string/ime_method" />
+    </PreferenceCategory>
+
+    <!-- Configuration Autodetection -->
     <PreferenceCategory android:title="@string/config_autodetect" >
         <CheckBoxPreference
             android:defaultValue="true"
@@ -52,6 +56,8 @@
             android:summary="@string/icade_profile_pad_four_desc"
             android:title="@string/icade_profile_pad_four" />
     </PreferenceCategory>
+
+    <!-- Debug Input Reporting -->
     <PreferenceCategory android:title="@string/debug_input_reporting" >
         <CheckBoxPreference
             android:defaultValue="false"
@@ -59,6 +65,8 @@
             android:summary="@string/debug_input_reporting_desc"
             android:title="@string/enable" />
     </PreferenceCategory>
+
+    <!-- Touchscreen Overlay -->
     <PreferenceCategory android:title="@string/touchscreen_overlay" >
         <CheckBoxPreference
             android:defaultValue="true"
@@ -80,6 +88,8 @@
             android:key="input_overlay_opacity"
             android:dependency="input_overlay_enable" />
     </PreferenceCategory>
+
+    <!-- Custom Bindings -->
     <PreferenceCategory android:title="@string/custom_binds">
         <PreferenceScreen
             android:title="@string/player_1_custom_binds"
@@ -290,6 +300,8 @@
                 android:title="@string/r3_button" />
         </PreferenceScreen>
     </PreferenceCategory>
+
+    <!-- Diagnostics -->
     <PreferenceCategory android:title="@string/diagnostics" >
         <Preference
             android:key="report_ime_pref"

android/phoenix/res/xml/path_preferences.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- ROM Paths -->
     <PreferenceCategory android:title="@string/rom_paths">
         <Preference android:title="@string/rom_directory"
             android:summary="@string/rom_directory_desc">
@@ -8,7 +10,8 @@
                 android:targetPackage="org.retroarch" />
         </Preference>
     </PreferenceCategory>
-    
+
+    <!-- Save Files -->
     <PreferenceCategory android:title="@string/save_files">
         <CheckBoxPreference android:title="@string/enable_custom_dir"
             android:summary="@string/savefiles_custom_dir"
@@ -22,6 +25,8 @@
                 android:targetPackage="org.retroarch" />
         </Preference>
     </PreferenceCategory>
+
+    <!-- Save States -->
     <PreferenceCategory android:title="@string/save_states">
         <CheckBoxPreference android:title="@string/enable_custom_dir"
             android:summary="@string/savestates_custom_dir"
@@ -35,6 +40,8 @@
                 android:targetPackage="org.retroarch" />
         </Preference>
     </PreferenceCategory>
+
+    <!-- System -->
     <PreferenceCategory android:title="@string/system">
         <CheckBoxPreference android:title="@string/enable_custom_dir"
             android:summary="@string/system_custom_dir"

android/phoenix/res/xml/video_preferences.xml

@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+        <!-- General -->
         <PreferenceCategory android:title="@string/general" >
+            <ListPreference
+                android:entries="@array/aspect_ratios"
+                android:entryValues="@array/aspect_values"
+                android:defaultValue="auto"
+                android:key="video_aspect_ratio"
+                android:summary="@string/aspect_ratio_desc"
+                android:title="@string/aspect_ratio" />
             <CheckBoxPreference
                 android:defaultValue="true"
                 android:key="video_vsync"
@@ -16,15 +25,9 @@
                 android:key="video_scale_integer"
                 android:summary="@string/scale_integer_desc"
                 android:title="@string/scale_integer" />
-
-            <ListPreference
-                android:entries="@array/aspect_ratios"
-                android:entryValues="@array/aspect_values"
-                android:defaultValue="auto"
-                android:key="video_aspect_ratio"
-                android:summary="@string/aspect_ratio_desc"
-                android:title="@string/aspect_ratio" />
         </PreferenceCategory>
+
+        <!-- Synchronization -->
         <PreferenceCategory android:title="@string/synchronization" >
             <CheckBoxPreference
                 android:defaultValue="true"
@@ -48,6 +51,8 @@
                 android:summary="@string/set_os_reported_refresh_rate_desc"
                 android:title="@string/set_os_reported_refresh_rate" />
         </PreferenceCategory>
+
+        <!-- Shaders -->
         <PreferenceCategory android:title="@string/shaders" >
             <CheckBoxPreference
                 android:defaultValue="true"
@@ -69,6 +74,8 @@
                     android:targetPackage="org.retroarch" />
             </Preference>
         </PreferenceCategory>
+
+        <!-- Fonts -->
         <PreferenceCategory android:title="@string/fonts">
             <CheckBoxPreference android:title="@string/onscreen_fonts"
                 android:summary="@string/onscreen_fonts_desc"