From 7abe27de81254ac5ecc7b6ff9fca82bae59af12f Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 12 Aug 2013 05:51:33 +0200
Subject: [PATCH] (Android Java) Create separate class for ReportIME

---
 android/phoenix/AndroidManifest.xml               |  1 +
 android/phoenix/res/menu/context_menu.xml         |  1 -
 android/phoenix/res/xml/prefs.xml                 |  8 ++++++++
 .../src/org/retroarch/browser/ReportIME.java      | 15 +++++++++++++++
 .../src/org/retroarch/browser/RetroArch.java      |  4 ----
 5 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 android/phoenix/src/org/retroarch/browser/ReportIME.java

diff --git a/android/phoenix/AndroidManifest.xml b/android/phoenix/AndroidManifest.xml
index f6166bedd4..54364a192e 100644
--- a/android/phoenix/AndroidManifest.xml
+++ b/android/phoenix/AndroidManifest.xml
@@ -24,6 +24,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
          </activity>
+        <activity android:name=".browser.ReportIME"></activity>
         <activity android:name=".browser.HelpActivity"></activity>
         <activity android:name=".browser.DirectoryActivity"></activity>
         <activity android:name=".browser.ROMActivity"></activity>
diff --git a/android/phoenix/res/menu/context_menu.xml b/android/phoenix/res/menu/context_menu.xml
index c1bfefb341..aa7695fc78 100644
--- a/android/phoenix/res/menu/context_menu.xml
+++ b/android/phoenix/res/menu/context_menu.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
     <item android:id="@+id/input_method_select" android:title="@string/input_method" android:showAsAction="ifRoom" />
-    <item android:id="@+id/report_ime" android:title="@string/report_ime"></item>
 </menu>
diff --git a/android/phoenix/res/xml/prefs.xml b/android/phoenix/res/xml/prefs.xml
index b895af4e48..72a6719ed9 100644
--- a/android/phoenix/res/xml/prefs.xml
+++ b/android/phoenix/res/xml/prefs.xml
@@ -383,6 +383,14 @@
 	                android:title="R3 Button" />
 	        </PreferenceScreen>
         </PreferenceCategory>
+        <PreferenceCategory android:title="Diagnostics" >
+            <Preference android:title="Report IME"
+                android:summary="Reports the current IME (Input Method Editor) name.">
+                <intent
+                    android:targetClass="org.retroarch.browser.ReportIME"
+                    android:targetPackage="org.retroarch" />
+            </Preference>
+        </PreferenceCategory>
     </PreferenceScreen>
     <PreferenceScreen android:title="Path Options">
         <PreferenceCategory android:title="ROM paths">
diff --git a/android/phoenix/src/org/retroarch/browser/ReportIME.java b/android/phoenix/src/org/retroarch/browser/ReportIME.java
new file mode 100644
index 0000000000..1a85b393ee
--- /dev/null
+++ b/android/phoenix/src/org/retroarch/browser/ReportIME.java
@@ -0,0 +1,15 @@
+package org.retroarch.browser;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.os.Bundle;
+import android.provider.Settings;
+
+public class ReportIME extends Activity {
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		String current_ime = Settings.Secure.getString(getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);
+		new AlertDialog.Builder(this).setMessage(current_ime).setNeutralButton("Close", null).show();
+	}
+}
diff --git a/android/phoenix/src/org/retroarch/browser/RetroArch.java b/android/phoenix/src/org/retroarch/browser/RetroArch.java
index 52bfb6ec1c..a001da96af 100644
--- a/android/phoenix/src/org/retroarch/browser/RetroArch.java
+++ b/android/phoenix/src/org/retroarch/browser/RetroArch.java
@@ -377,10 +377,6 @@ public class RetroArch extends Activity implements
 			InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 			imm.showInputMethodPicker();
 			return true;
-		case R.id.report_ime:
-			String current_ime = Settings.Secure.getString(getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);
-			new AlertDialog.Builder(this).setMessage(current_ime).setNeutralButton("Close", null).show();
-			return true;
 		default:
 			return false;
 		}