[Android] Implement a ViewPager for the settings. Also, move classes into appropriate packages to make things cleaner.

6 files changed, 161 insertions, 152 deletions

diff --git a/Source/Android/res/layout/prefs_viewpager.xml b/Source/Android/res/layout/prefs_viewpager.xml
new file mode 100644
index 0000000000..f07fc62c46
--- /dev/null
+++ b/Source/Android/res/layout/prefs_viewpager.xml
@@ -0,0 +1,6 @@
+<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/pager"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".PrefsActivity" />
diff --git a/Source/Android/res/values/dimens.xml b/Source/Android/res/values/dimens.xml
new file mode 100644
index 0000000000..55c1e5908c
--- /dev/null
+++ b/Source/Android/res/values/dimens.xml
@@ -0,0 +1,7 @@
+<resources>
+
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+
+</resources>
diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml
index 6ddd255995..009387ff77 100644
--- a/Source/Android/res/values/strings.xml
+++ b/Source/Android/res/values/strings.xml
@@ -3,22 +3,22 @@
 
     <!-- Title of the app -->
     <string name="app_name">Dolphin Emulator</string>
-    
+
     <!-- Navigation-related Strings -->
     <string name="drawer_open">Open navigation drawer</string>
     <string name="drawer_close">Close navigation drawer</string>
-    
+
     <!-- About Fragment -->
     <string name="build_revision">Build Revision:</string>
     <string name="supports_gles3">Supports OpenGL ES 3:</string>
-    
+
     <!-- Folder Browser -->
     <string name="current_dir">Current Dir: </string>
     <string name="parent_directory">Parent Directory</string>
     <string name="folder">Folder</string>
     <string name="file_size">File Size: </string>
     <string name="cant_use_compressed_filetypes">Can not use compressed file types</string>
-    
+
     <!-- Game List Activity -->
     <string name="game_list">Game List</string>
     <string name="browse_folder">Browse Folder</string>
@@ -28,7 +28,7 @@
 
     <!-- Game List Fragment -->
     <string name="file_clicked">File clicked: </string>
-    
+
     <!-- Input Config Fragment -->
     <string name="draw_onscreen_controls">Draw on-screen controls</string>
     <string name="button_a">Button A</string>
@@ -51,11 +51,10 @@
     <string name="c_stick_right">C Stick Right</string>
     <string name="trigger_left">Trigger L</string>
     <string name="trigger_right">Trigger R</string>
-    
     <string name="not_drawing_onscreen_controls">Not drawing on-screen controls</string>
     <string name="drawing_onscreen_controls">Drawing on-screen controls</string>
     <string name="press_button_to_config">Press button to configure %1$s</string>
-    
+
     <!-- Prefs Fragment -->
     <string name="interpreter">Interpreter</string>
     <string name="jit64_recompiler">JIT64 Recompiler</string>
@@ -66,7 +65,6 @@
     <string name="emu_core_to_use">Emulation core to use</string>
     <string name="dual_core">Dual Core</string>
     <string name="on_off">On/Off</string>
-    
     <string name="video_settings">Video Settings</string>
     <string name="software_renderer">Software Renderer</string>
     <string name="opengl_es3">OpenGL ES 3</string>
@@ -121,5 +119,6 @@
     <string name="no">No</string>
     <string name="disabled">Disabled</string>
     <string name="other">Other</string>
+    
 
 </resources>
diff --git a/Source/Android/res/xml/cpu_prefs.xml b/Source/Android/res/xml/cpu_prefs.xml
new file mode 100644
index 0000000000..adb6fff91f
--- /dev/null
+++ b/Source/Android/res/xml/cpu_prefs.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- CPU Settings -->             
+    <CheckBoxPreference
+           android:key="dualCorePref"
+           android:summary="@string/on_off"
+           android:title="@string/dual_core" />
+    
+    <ListPreference
+        android:key="cpuCorePref"
+        android:summary="@string/emu_core_to_use"
+        android:title="@string/cpu_core" />
+        
+</PreferenceScreen>
\ No newline at end of file
diff --git a/Source/Android/res/xml/prefs.xml b/Source/Android/res/xml/prefs.xml
deleted file mode 100644
index 89c531f2d0..0000000000
--- a/Source/Android/res/xml/prefs.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    
-    <!-- CPU Settings -->
-    <PreferenceScreen android:title="@string/cpu_settings">
-	            
-        <CheckBoxPreference
-               android:key="dualCorePref"
-               android:summary="@string/on_off"
-               android:title="@string/dual_core" />
-        
-        <ListPreference
-            android:key="cpuCorePref"
-            android:summary="@string/emu_core_to_use"
-            android:title="@string/cpu_core" />
-	        
-    </PreferenceScreen>
-    
-    <!-- Video Settings -->
-    <PreferenceScreen android:title="@string/video_settings">
-        
-        <!-- Video Enhancements -->
-        <PreferenceScreen android:title="@string/enhancements">
-            
-            <ListPreference
-                android:entries="@array/internalResolutionEntries"
-                android:entryValues="@array/internalResolutionValues"
-                android:key="internalResolution"
-                android:summary="@string/internal_resolution_descrip"
-                android:title="@string/internal_resolution"/>
-            
-            <ListPreference 
-                android:entries="@array/anisotropicFilteringEntries"
-                android:entryValues="@array/anisotropicFilteringValues"
-                android:key="anisotropicFiltering"
-                android:summary="@string/anisotropic_filtering_descrip"
-                android:title="@string/anisotropic_filtering"/>
-            
-            <CheckBoxPreference
-                android:defaultValue="true"
-                android:key="scaledEFBCopy"
-                android:summary="@string/scaled_efb_copy_descrip"
-                android:title="@string/scaled_efb_copy"/>
-            
-            <CheckBoxPreference
-                android:defaultValue="false"
-                android:key="perPixelLighting"
-                android:summary="@string/per_pixel_lighting_descrip"
-                android:title="@string/per_pixel_lighting"/>
-            
-            <CheckBoxPreference
-                android:defaultValue="false"
-                android:key="forceTextureFiltering"
-                android:summary="@string/force_texture_filtering_descrip"
-                android:title="@string/force_texture_filtering"/>
-            
-            <CheckBoxPreference
-                android:defaultValue="false"
-                android:key="disableFog"
-                android:summary="@string/disable_fog_descrip"
-                android:title="@string/disable_fog"/>
-            
-        </PreferenceScreen>
-        
-        <!-- Video Hacks -->
-        <PreferenceScreen android:title="@string/hacks">
-            <PreferenceCategory android:title="@string/embedded_frame_buffer">
-                
-	            <CheckBoxPreference
-	                android:defaultValue="false"
-	                android:key="skipEFBAccess"
-	                android:summary="@string/skip_efb_access_descrip"
-	                android:title="@string/skip_efb_access"/>
-	            
-	            <CheckBoxPreference
-	                android:defaultValue="true"
-	                android:key="ignoreFormatChanges"
-	                android:summary="@string/ignore_format_changes_descrip" 
-	                android:title="@string/ignore_format_changes"/>
-	            
-	            <ListPreference
-	                android:defaultValue="Texture"
-	                android:entries="@array/efbCopyMethodEntries"
-	                android:entryValues="@array/efbCopyMethodValues"
-	                android:key="efbCopyMethod"
-	                android:summary="@string/efb_copy_method_descrip"
-	                android:title="@string/efb_copy_method"/>
-	            
-	        </PreferenceCategory>
-	            
-            <!-- Texture Cache -->
-            <PreferenceCategory android:title="@string/texture_cache">
-	            <ListPreference
-	                android:defaultValue="Low"
-	                android:entries="@array/textureCacheAccuracyEntries"
-	                android:entryValues="@array/textureCacheAccuracyValues"
-	                android:key="textureCacheAccuracy"
-	                android:summary="@string/texture_cache_accuracy_descrip"
-	                android:title="@string/texture_cache_accuracy"/>
-            </PreferenceCategory>
-            
-            <!-- External Frame Buffer -->
-            <PreferenceCategory android:title="@string/external_frame_buffer">
-            <ListPreference
-                android:defaultValue="Disabled"
-                android:entries="@array/externalFrameBufferEntries"
-                android:entryValues="@array/externalFrameBufferValues"
-                android:key="externalFrameBuffer"
-                android:summary="@string/external_frame_buffer_descrip"
-                android:title="@string/external_frame_buffer"/>
-            </PreferenceCategory>
-            
-            
-            <!-- Other Hacks -->
-            <PreferenceCategory android:title="@string/other">
-                
-                <CheckBoxPreference
-                    android:defaultValue="false"
-                    android:key="cacheDisplayLists"
-                    android:summary="@string/cache_display_lists_descrip"
-                    android:title="@string/cache_display_lists"/>
-                
-                <CheckBoxPreference
-                    android:defaultValue="false"
-                    android:key="disableDestinationAlpha"
-                    android:summary="@string/disable_destination_alpha_descrip"
-                    android:title="@string/disable_destination_alpha"/>
-                
-                <CheckBoxPreference 
-                    android:defaultValue="true"
-                    android:key="fastDepthCalculation"
-                    android:summary="@string/fast_depth_calculation_descrip"
-                    android:title="@string/fast_depth_calculation"/>
-                
-            </PreferenceCategory>
-        </PreferenceScreen>
-	        
-        <ListPreference
-               android:key="gpuPref"
-               android:summary="@string/video_backend_to_use"
-               android:title="@string/video_backend" />
-	        
-    </PreferenceScreen>
-</PreferenceScreen>
\ No newline at end of file
diff --git a/Source/Android/res/xml/video_prefs.xml b/Source/Android/res/xml/video_prefs.xml
new file mode 100644
index 0000000000..2abd8deabf
--- /dev/null
+++ b/Source/Android/res/xml/video_prefs.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    
+    <!-- Video Settings -->
+
+        
+    <!-- Video Enhancements -->
+    <PreferenceScreen android:title="@string/enhancements">
+        
+        <ListPreference
+            android:entries="@array/internalResolutionEntries"
+            android:entryValues="@array/internalResolutionValues"
+            android:key="internalResolution"
+            android:summary="@string/internal_resolution_descrip"
+            android:title="@string/internal_resolution"/>
+        
+        <ListPreference 
+            android:entries="@array/anisotropicFilteringEntries"
+            android:entryValues="@array/anisotropicFilteringValues"
+            android:key="anisotropicFiltering"
+            android:summary="@string/anisotropic_filtering_descrip"
+            android:title="@string/anisotropic_filtering"/>
+        
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="scaledEFBCopy"
+            android:summary="@string/scaled_efb_copy_descrip"
+            android:title="@string/scaled_efb_copy"/>
+        
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="perPixelLighting"
+            android:summary="@string/per_pixel_lighting_descrip"
+            android:title="@string/per_pixel_lighting"/>
+        
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="forceTextureFiltering"
+            android:summary="@string/force_texture_filtering_descrip"
+            android:title="@string/force_texture_filtering"/>
+        
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="disableFog"
+            android:summary="@string/disable_fog_descrip"
+            android:title="@string/disable_fog"/>
+        
+    </PreferenceScreen>
+    
+    <!-- Video Hacks -->
+    <PreferenceScreen android:title="@string/hacks">
+        <PreferenceCategory android:title="@string/embedded_frame_buffer">
+            
+         <CheckBoxPreference
+             android:defaultValue="false"
+             android:key="skipEFBAccess"
+             android:summary="@string/skip_efb_access_descrip"
+             android:title="@string/skip_efb_access"/>
+         
+         <CheckBoxPreference
+             android:defaultValue="true"
+             android:key="ignoreFormatChanges"
+             android:summary="@string/ignore_format_changes_descrip" 
+             android:title="@string/ignore_format_changes"/>
+         
+         <ListPreference
+             android:defaultValue="Texture"
+             android:entries="@array/efbCopyMethodEntries"
+             android:entryValues="@array/efbCopyMethodValues"
+             android:key="efbCopyMethod"
+             android:summary="@string/efb_copy_method_descrip"
+             android:title="@string/efb_copy_method"/>
+         
+     </PreferenceCategory>
+         
+        <!-- Texture Cache -->
+        <PreferenceCategory android:title="@string/texture_cache">
+         <ListPreference
+             android:defaultValue="Low"
+             android:entries="@array/textureCacheAccuracyEntries"
+             android:entryValues="@array/textureCacheAccuracyValues"
+             android:key="textureCacheAccuracy"
+             android:summary="@string/texture_cache_accuracy_descrip"
+             android:title="@string/texture_cache_accuracy"/>
+        </PreferenceCategory>
+        
+        <!-- External Frame Buffer -->
+        <PreferenceCategory android:title="@string/external_frame_buffer">
+        <ListPreference
+            android:defaultValue="Disabled"
+            android:entries="@array/externalFrameBufferEntries"
+            android:entryValues="@array/externalFrameBufferValues"
+            android:key="externalFrameBuffer"
+            android:summary="@string/external_frame_buffer_descrip"
+            android:title="@string/external_frame_buffer"/>
+        </PreferenceCategory>
+        
+        
+        <!-- Other Hacks -->
+        <PreferenceCategory android:title="@string/other">
+            
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="cacheDisplayLists"
+                android:summary="@string/cache_display_lists_descrip"
+                android:title="@string/cache_display_lists"/>
+            
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="disableDestinationAlpha"
+                android:summary="@string/disable_destination_alpha_descrip"
+                android:title="@string/disable_destination_alpha"/>
+            
+            <CheckBoxPreference 
+                android:defaultValue="true"
+                android:key="fastDepthCalculation"
+                android:summary="@string/fast_depth_calculation_descrip"
+                android:title="@string/fast_depth_calculation"/>
+            
+        </PreferenceCategory>
+    </PreferenceScreen>
+     
+    <ListPreference
+           android:key="gpuPref"
+           android:summary="@string/video_backend_to_use"
+           android:title="@string/video_backend" />
+</PreferenceScreen>
\ No newline at end of file