From 6b5f21479ebde693457ecee1f61341b91732c0e0 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Thu, 10 Oct 2013 10:12:09 -0400
Subject: [PATCH 1/2] [Android] No need to call flush() before closing a
 stream. close() calls the flush method before actually closing the stream.

---
 android/phoenix/src/org/retroarch/browser/MainMenuActivity.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java b/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java
index 9e4d163c09..87c4f6ef19 100644
--- a/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java
@@ -131,7 +131,6 @@ public final class MainMenuActivity extends PreferenceActivity {
 					new FileOutputStream(new File(dataDir, relativePath)));
 
 			writer.write(asset, 0, asset.length);
-			writer.flush();
 			writer.close();
 		}
 	}

From e177f6f35a005ed71693d205331da55a8581c78d Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Thu, 10 Oct 2013 10:31:03 -0400
Subject: [PATCH 2/2] [Android] Add comments to prefs.xml to clarify which
 section starts where within the XML.

---
 android/phoenix/res/xml/prefs.xml | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/android/phoenix/res/xml/prefs.xml b/android/phoenix/res/xml/prefs.xml
index c6a302437f..f953cffd25 100644
--- a/android/phoenix/res/xml/prefs.xml
+++ b/android/phoenix/res/xml/prefs.xml
@@ -2,26 +2,35 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/mainmenu_title" >
 
+    <!-- TV Mode -->
     <PreferenceScreen android:title="@string/tv_mode">
        <intent
           android:targetClass="org.retroarch.browser.RetroTVMode"
           android:targetPackage="org.retroarch" />
     </PreferenceScreen>
+
+    <!-- Load Core -->
     <PreferenceScreen android:title="@string/load_core">
        <intent
           android:targetClass="org.retroarch.browser.CoreSelection"
           android:targetPackage="org.retroarch" />
     </PreferenceScreen>
+
+    <!-- Load Game -->
     <PreferenceScreen android:title="@string/load_game">
        <intent
           android:targetClass="org.retroarch.browser.diractivities.ROMActivity"
           android:targetPackage="org.retroarch" />
     </PreferenceScreen>
+
+    <!-- Load Game (History) -->
     <PreferenceScreen android:title="@string/load_game_history">
        <intent
           android:targetClass="org.retroarch.browser.HistorySelection"
           android:targetPackage="org.retroarch" />
     </PreferenceScreen>
+
+    <!-- Video Options -->
     <PreferenceScreen android:title="@string/video_options" >
         <PreferenceCategory android:title="@string/general" >
             <CheckBoxPreference
@@ -102,6 +111,8 @@
                 android:defaultValue="true"/>
         </PreferenceCategory>
     </PreferenceScreen>
+
+    <!-- Audio Options -->
     <PreferenceScreen android:title="@string/audio_options" >
         <PreferenceCategory android:title="@string/audio" >
             <CheckBoxPreference
@@ -130,6 +141,8 @@
                 android:dependency="audio_enable" />
         </PreferenceCategory>
     </PreferenceScreen>
+
+    <!-- Input Options -->
     <PreferenceScreen android:title="@string/input_options" >
        <PreferenceCategory android:title="@string/general" >
             <ListPreference
@@ -158,10 +171,9 @@
                 android:summary="@string/config_autodetect_desc"
                 android:title="@string/enable"
                 android:disableDependentsState="true" />
-        <PreferenceScreen android:title="@string/list_autodetected" >
-       <PreferenceCategory android:title="@string/autodetected_pads" android:layout="@layout/faq_supported_pads" >
-        </PreferenceCategory>
-     </PreferenceScreen>
+            <PreferenceScreen android:title="@string/list_autodetected" >
+                <PreferenceCategory android:title="@string/autodetected_pads" android:layout="@layout/faq_supported_pads" />
+            </PreferenceScreen>
             <ListPreference
                 android:entries="@array/icade_profiles"
                 android:entryValues="@array/icade_profiles_values"
@@ -434,6 +446,8 @@
             </Preference>
         </PreferenceCategory>
     </PreferenceScreen>
+    
+    <!-- Path Options -->
     <PreferenceScreen android:title="@string/path_options">
         <PreferenceCategory android:title="@string/rom_paths">
             <Preference android:title="@string/rom_directory"
@@ -484,6 +498,8 @@
             </Preference>
         </PreferenceCategory>
     </PreferenceScreen>
+
+    <!-- Settings -->
     <PreferenceScreen android:title="@string/settings" >
         <PreferenceCategory android:title="@string/config_style" >
             <CheckBoxPreference
@@ -513,11 +529,15 @@
                 android:title="@string/enable" />
         </PreferenceCategory>
     </PreferenceScreen>
+
+    <!-- Help -->
     <PreferenceScreen android:title="@string/help">
        <intent
           android:targetClass="org.retroarch.browser.HelpActivity"
           android:targetPackage="org.retroarch" />
     </PreferenceScreen>
+
+    <!-- About -->
     <PreferenceScreen android:title="@string/about">
         <PreferenceCategory android:title="@string/websites">
            <Preference android:title="@string/retro_website"