From a73b40fe0e82a298500c809186e85721fb26ff33 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sun, 21 Dec 2014 00:22:49 -0500
Subject: [PATCH] Android: Move the core manager option to the main menu

---
 android/phoenix/res/xml/general_preferences.xml | 10 ----------
 android/phoenix/res/xml/main_menu.xml           | 10 +++++++++-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/android/phoenix/res/xml/general_preferences.xml b/android/phoenix/res/xml/general_preferences.xml
index 3685aeb6b1..0bb2717b70 100644
--- a/android/phoenix/res/xml/general_preferences.xml
+++ b/android/phoenix/res/xml/general_preferences.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- Core Management -->
-    <PreferenceCategory android:title="@string/core_management">
-        <Preference 
-            android:title="@string/manage_cores">
-            <intent
-                android:targetClass="com.retroarch.browser.coremanager.CoreManagerActivity"
-                android:targetPackage="com.retroarch"/>
-        </Preference>
-    </PreferenceCategory>
-
     <!-- Configuration Style -->
     <PreferenceCategory android:title="@string/config_style" >
         <CheckBoxPreference
diff --git a/android/phoenix/res/xml/main_menu.xml b/android/phoenix/res/xml/main_menu.xml
index b67a8b53e7..a99f1504a9 100644
--- a/android/phoenix/res/xml/main_menu.xml
+++ b/android/phoenix/res/xml/main_menu.xml
@@ -2,7 +2,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/mainmenu_title" >
 
-    <!-- TV Mode -->
+    <!-- Resume Content -->
     <Preference
         android:key="resumeContentPref"
         android:title="@string/resume_content"/>
@@ -27,6 +27,14 @@
         android:key="loadContentHistoryPref"
         android:title="@string/load_content_history"/>
 
+    <!-- Manage Cores -->
+    <Preference 
+        android:title="@string/manage_cores">
+        <intent
+            android:targetClass="com.retroarch.browser.coremanager.CoreManagerActivity"
+            android:targetPackage="com.retroarch"/>
+     </Preference>
+
     <!-- Settings -->
     <Preference android:title="@string/settings">
        <intent