[Android] Implement a ViewPager for the settings. Also, move classes …

…into appropriate packages to make things cleaner.

Source/Android/AndroidManifest.xml

@@ -4,45 +4,51 @@
     android:versionCode="10"
     android:versionName="0.10" >
 
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14"/>
-
-    <uses-feature android:glEsVersion="0x00020000"></uses-feature>
-		<uses-feature android:name="android.hardware.screen.landscape" />
-		<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-		<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-
-		<application
+    <uses-sdk
+        android:minSdkVersion="14"
+        android:targetSdkVersion="14" />
+
+    <uses-feature android:glEsVersion="0x00020000" >
+    </uses-feature>
+    <uses-feature android:name="android.hardware.screen.landscape" />
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
+    <application
         android:icon="@drawable/launcher"
-        android:label="@string/app_name">
+        android:label="@string/app_name" >
         <activity
-            android:name=".DolphinEmulator"
+            android:name="org.dolphinemu.dolphinemu.DolphinEmulator"
+            android:configChanges="locale|keyboard|keyboardHidden|navigation|fontScale|uiMode"
             android:label="@string/app_name"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
             android:screenOrientation="landscape"
-            android:configChanges="locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
-            android:name="org.dolphinemu.dolphinemu.FolderBrowser"
-            android:label="@string/app_name"
-            android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
+            android:name="org.dolphinemu.dolphinemu.folderbrowser.FolderBrowser"
+            android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode"
+            android:label="@string/app_name" >
         </activity>
         <activity
-            android:name=".InputConfigFragment"
-            android:label="@string/app_name"
-            android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
+            android:name="org.dolphinemu.dolphinemu.inputconfig.InputConfigFragment"
+            android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode"
+            android:label="@string/app_name" >
         </activity>
-        <activity
-                android:name=".PrefsFragment" >
+        <activity android:name="org.dolphinemu.dolphinemu.settings.PrefsFragment" >
         </activity>
-        <activity
-            android:name=".GameListActivity" >
+        <activity android:name="org.dolphinemu.dolphinemu.gamelist.GameListActivity" >
+        </activity>
+        <activity android:name="org.dolphinemu.dolphinemu.AboutFragment" >
         </activity>
         <activity
-            android:name=".AboutFragment" >
+            android:name="org.dolphinemu.dolphinemu.settings.PrefsActivity"
+            android:label="@string/settings" >
         </activity>
     </application>
 

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" />

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>

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>

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>