From ad4ecbab0e56d989c62636982f7fb7e7ae55e76e Mon Sep 17 00:00:00 2001
From: TwistedUmbrella <twistedumbrella@gmail.com>
Date: Mon, 3 Mar 2014 11:37:29 -0500
Subject: [PATCH 1/7] Integrate an inline messaging system using Android GCM

---
 shell/android/res/layout/drawer_menu.xml      | 119 ++--
 shell/android/res/layout/toast_layout.xml     |  32 +
 shell/android/res/values/strings.xml          |   2 +
 .../com/reicast/emulator/AboutFragment.java   |   9 +-
 .../com/reicast/emulator/MainActivity.java    |  16 +-
 .../com/reicast/emulator/config/Config.java   |  37 ++
 shell/debug/AndroidManifest.xml               |  26 +-
 shell/debug/build.xml                         |   2 +-
 shell/debug/res/drawable/gradient_bg.xml      |  12 +
 .../debug/res/drawable/gradient_bg_hover.xml  |  12 +
 shell/debug/res/drawable/image_bg.xml         |  14 +
 shell/debug/res/drawable/list_selector.xml    |   9 +
 shell/debug/res/layout/dialog_item.xml        |  57 ++
 shell/debug/res/layout/dialog_message.xml     |  38 ++
 shell/debug/res/values/colors.xml             |   5 +
 shell/debug/res/values/strings.xml            |   2 +-
 shell/debug/res/values/themes.xml             |  12 +
 .../src/com/reicast/emulator/debug/Debug.java | 554 ++++++++++++++++++
 .../com/reicast/emulator/debug/Debugger.java  |  28 -
 .../emulator/debug/ExpandableListView.java    |  33 ++
 .../emulator/debug/GcmBroadcastReceiver.java  |  89 +++
 .../emulator/debug/RequestArchive.java        | 123 ++++
 22 files changed, 1146 insertions(+), 85 deletions(-)
 create mode 100755 shell/android/res/layout/toast_layout.xml
 create mode 100755 shell/debug/res/drawable/gradient_bg.xml
 create mode 100755 shell/debug/res/drawable/gradient_bg_hover.xml
 create mode 100755 shell/debug/res/drawable/image_bg.xml
 create mode 100755 shell/debug/res/drawable/list_selector.xml
 create mode 100644 shell/debug/res/layout/dialog_item.xml
 create mode 100644 shell/debug/res/layout/dialog_message.xml
 create mode 100755 shell/debug/res/values/colors.xml
 create mode 100644 shell/debug/res/values/themes.xml
 create mode 100644 shell/debug/src/com/reicast/emulator/debug/Debug.java
 delete mode 100644 shell/debug/src/com/reicast/emulator/debug/Debugger.java
 create mode 100644 shell/debug/src/com/reicast/emulator/debug/ExpandableListView.java
 create mode 100644 shell/debug/src/com/reicast/emulator/debug/GcmBroadcastReceiver.java
 create mode 100644 shell/debug/src/com/reicast/emulator/debug/RequestArchive.java

diff --git a/shell/android/res/layout/drawer_menu.xml b/shell/android/res/layout/drawer_menu.xml
index c13daa8f1..62ce95152 100644
--- a/shell/android/res/layout/drawer_menu.xml
+++ b/shell/android/res/layout/drawer_menu.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@drawable/background" >
+    android:background="@drawable/background"
+    android:orientation="vertical" >
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -16,12 +16,12 @@
             android:id="@+id/browser_menu"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:gravity="center_vertical|left"
             android:layout_marginLeft="4dp"
-            android:orientation="horizontal"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/game_selector"
             android:focusable="true"
-            android:background="@drawable/game_selector" >
+            android:gravity="center_vertical|left"
+            android:orientation="horizontal" >
 
             <ImageView
                 android:id="@+id/browser"
@@ -34,25 +34,25 @@
 
             <TextView
                 android:id="@+id/browser_title"
+                style="@android:style/TextAppearance.Large"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-				style="@android:style/TextAppearance.Large"
                 android:text="@string/browser"
-                android:textSize="28dp"
-                android:textAppearance="@style/BaseText" />
+                android:textAppearance="@style/BaseText"
+                android:textSize="28dp" />
         </LinearLayout>
 
         <LinearLayout
             android:id="@+id/settings_menu"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:gravity="center_vertical|left"
             android:layout_marginLeft="26dp"
-            android:orientation="horizontal"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/game_selector"
             android:focusable="true"
-            android:background="@drawable/game_selector" >
+            android:gravity="center_vertical|left"
+            android:orientation="horizontal" >
 
             <ImageView
                 android:id="@+id/config"
@@ -65,25 +65,25 @@
 
             <TextView
                 android:id="@+id/config_title"
+                style="@android:style/TextAppearance.Large"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-				style="@android:style/TextAppearance.Large"
                 android:text="@string/settings"
-                android:textSize="28dp"
-                android:textAppearance="@style/BaseText" />
+                android:textAppearance="@style/BaseText"
+                android:textSize="28dp" />
         </LinearLayout>
 
         <LinearLayout
             android:id="@+id/paths_menu"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:gravity="center_vertical|left"
             android:layout_marginLeft="4dp"
-            android:orientation="horizontal"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/game_selector"
             android:focusable="true"
-            android:background="@drawable/game_selector" >
+            android:gravity="center_vertical|left"
+            android:orientation="horizontal" >
 
             <ImageView
                 android:id="@+id/options"
@@ -96,25 +96,25 @@
 
             <TextView
                 android:id="@+id/options_title"
+                style="@android:style/TextAppearance.Large"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-				style="@android:style/TextAppearance.Large"
                 android:text="@string/paths"
-                android:textSize="28dp"
-                android:textAppearance="@style/BaseText" />
+                android:textAppearance="@style/BaseText"
+                android:textSize="28dp" />
         </LinearLayout>
 
         <LinearLayout
             android:id="@+id/input_menu"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:gravity="center_vertical|left"
             android:layout_marginLeft="26dp"
-            android:orientation="horizontal"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/game_selector"
             android:focusable="true"
-            android:background="@drawable/game_selector" >
+            android:gravity="center_vertical|left"
+            android:orientation="horizontal" >
 
             <ImageView
                 android:id="@+id/input"
@@ -127,25 +127,25 @@
 
             <TextView
                 android:id="@+id/input_title"
+                style="@android:style/TextAppearance.Large"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-				style="@android:style/TextAppearance.Large"
                 android:text="@string/input"
-                android:textSize="28dp"
-                android:textAppearance="@style/BaseText" />
+                android:textAppearance="@style/BaseText"
+                android:textSize="28dp" />
         </LinearLayout>
 
         <LinearLayout
             android:id="@+id/about_menu"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:gravity="center_vertical|left"
             android:layout_marginLeft="4dp"
-            android:orientation="horizontal"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/game_selector"
             android:focusable="true"
-            android:background="@drawable/game_selector" >
+            android:gravity="center_vertical|left"
+            android:orientation="horizontal" >
 
             <ImageView
                 android:id="@+id/about"
@@ -158,25 +158,25 @@
 
             <TextView
                 android:id="@+id/about_title"
+                style="@android:style/TextAppearance.Large"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-				style="@android:style/TextAppearance.Large"
                 android:text="@string/about"
-                android:textSize="28dp"
-                android:textAppearance="@style/BaseText" />
+                android:textAppearance="@style/BaseText"
+                android:textSize="28dp" />
         </LinearLayout>
 
         <LinearLayout
             android:id="@+id/rateme_menu"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:gravity="center_vertical|left"
             android:layout_marginLeft="26dp"
-            android:orientation="horizontal"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/game_selector"
             android:focusable="true"
-            android:background="@drawable/game_selector" >
+            android:gravity="center_vertical|left"
+            android:orientation="horizontal" >
 
             <ImageView
                 android:id="@+id/rate"
@@ -188,13 +188,44 @@
 
             <TextView
                 android:id="@+id/rateme_title"
+                style="@android:style/TextAppearance.Large"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-				style="@android:style/TextAppearance.Large"
                 android:text="@string/rateme"
-                android:textSize="28dp"
-                android:textAppearance="@style/BaseText" />
+                android:textAppearance="@style/BaseText"
+                android:textSize="28dp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/message_menu"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="4dp"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/game_selector"
+            android:focusable="true"
+            android:gravity="center_vertical|left"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:id="@+id/messages"
+                android:layout_width="52dp"
+                android:layout_height="match_parent"
+                android:layout_margin="2dp"
+                android:gravity="center_vertical|left"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_launcher" />
+
+            <TextView
+                android:id="@+id/message_title"
+                style="@android:style/TextAppearance.Large"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:text="@string/messages"
+                android:textAppearance="@style/BaseText"
+                android:textSize="28dp" />
         </LinearLayout>
     </LinearLayout>
 
diff --git a/shell/android/res/layout/toast_layout.xml b/shell/android/res/layout/toast_layout.xml
new file mode 100755
index 000000000..d9a5993fe
--- /dev/null
+++ b/shell/android/res/layout/toast_layout.xml
@@ -0,0 +1,32 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/toast_layout_root"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="#50FFFFFF"
+    android:orientation="horizontal"
+    android:padding="5dp"
+    android:alpha="0.5">
+    
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:adjustViewBounds="true"
+        android:maxHeight="80dip"
+        android:maxWidth="80dip" />
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_toRightOf="@+id/image"
+        android:layout_marginLeft="5dip"
+        android:includeFontPadding="false"
+        android:lineSpacingMultiplier="1.0"
+        android:textColor="#000000"
+        android:textSize="18dip"
+        android:typeface="sans" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/shell/android/res/values/strings.xml b/shell/android/res/values/strings.xml
index 72cb6e40f..99229ceba 100644
--- a/shell/android/res/values/strings.xml
+++ b/shell/android/res/values/strings.xml
@@ -15,6 +15,7 @@
     <string name="missing_flash">Flash Missing. The Dreamcast Flash is required for this emulator to work. Place the Flash file in %1$s/data/dc_flash.bin</string>
     <string name="require_bios">You have to provide the BIOS</string>
     <string name="data_folder">The data folder is assumed</string>
+    <string name="git_broken">GitHub Native Unavailable!</string>
     
     <string name="folder_bios">BOOT BIOS</string>
     <string name="folder_select">SELECT CURRENT FOLDER</string>
@@ -87,6 +88,7 @@
     <string name="paths">Paths</string>
     <string name="input">Input</string>
     <string name="about">About</string>
+    <string name="messages">Messages</string>
     <string name="rateme">Rate Me</string>
     
     <string name="textOn">ON</string>
diff --git a/shell/android/src/com/reicast/emulator/AboutFragment.java b/shell/android/src/com/reicast/emulator/AboutFragment.java
index dabe8812b..324087aa2 100644
--- a/shell/android/src/com/reicast/emulator/AboutFragment.java
+++ b/shell/android/src/com/reicast/emulator/AboutFragment.java
@@ -93,6 +93,7 @@ import android.widget.SlidingDrawer.OnDrawerOpenListener;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.reicast.emulator.config.Config;
 import com.reicast.emulator.debug.GitAdapter;
 
 @SuppressWarnings("deprecation")
@@ -258,9 +259,7 @@ public class AboutFragment extends Fragment {
 			} catch (JSONException e) {
 				handler.post(new Runnable() {
 					public void run() {
-						Toast.makeText(parentActivity,
-								"GitHub Native Unavailable!", Toast.LENGTH_LONG)
-								.show();
+						Config.customNotify(parentActivity, R.drawable.ic_github, R.string.git_broken);
 						slidingGithub.close();
 					}
 				});
@@ -268,9 +267,7 @@ public class AboutFragment extends Fragment {
 			} catch (Exception e) {
 				handler.post(new Runnable() {
 					public void run() {
-						Toast.makeText(parentActivity,
-								"GitHub Native Unavailable!", Toast.LENGTH_LONG)
-								.show();
+						Config.customNotify(parentActivity, R.drawable.ic_github, R.string.git_broken);
 						slidingGithub.close();
 					}
 				});
diff --git a/shell/android/src/com/reicast/emulator/MainActivity.java b/shell/android/src/com/reicast/emulator/MainActivity.java
index 6a71452e9..ead481498 100644
--- a/shell/android/src/com/reicast/emulator/MainActivity.java
+++ b/shell/android/src/com/reicast/emulator/MainActivity.java
@@ -53,6 +53,7 @@ public class MainActivity extends SlidingFragmentActivity implements
 	
 	private UncaughtExceptionHandler mUEHandler;
 
+	private Intent debugger;
 	public static boolean debugUser;
 
 	Gamepad pad = new Gamepad();
@@ -65,8 +66,8 @@ public class MainActivity extends SlidingFragmentActivity implements
 
 		mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
 
-		Intent debugger = new Intent("com.reicast.emulator.debug.Debugger");
-		debugger.setAction("com.reicast.emulator.DEBUG");
+		debugger = new Intent("com.reicast.emulator.debug.Debug");
+		debugger.setAction("reicast.emulator.DEBUG");
 		if (isCallable(debugger)) {
 			MainActivity.debugUser = true;
 		}
@@ -283,6 +284,17 @@ public class MainActivity extends SlidingFragmentActivity implements
 						}
 					});
 				}
+
+				View messages = findViewById(R.id.message_menu);
+				if (MainActivity.debugUser) {
+					messages.setOnClickListener(new OnClickListener() {
+						public void onClick(View view) {
+							startActivity(debugger);
+						}
+					});
+				} else {
+					messages.setVisibility(View.GONE);
+				}
 			}
 		});
 		findViewById(R.id.header_list).setOnTouchListener(new OnTouchListener() {
diff --git a/shell/android/src/com/reicast/emulator/config/Config.java b/shell/android/src/com/reicast/emulator/config/Config.java
index 5401f5fae..2fae922ae 100644
--- a/shell/android/src/com/reicast/emulator/config/Config.java
+++ b/shell/android/src/com/reicast/emulator/config/Config.java
@@ -1,10 +1,20 @@
 package com.reicast.emulator.config;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
+import android.util.DisplayMetrics;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
 
 import com.android.util.DreamTime;
+import com.reicast.emulator.R;
 import com.reicast.emulator.emu.JNIdc;
 
 public class Config {
@@ -75,4 +85,31 @@ public class Config {
 		JNIdc.dreamtime(DreamTime.getDreamtime());
 	}
 
+	public static void customNotify(Activity activity, int icon, int message) {
+		LayoutInflater inflater = activity.getLayoutInflater();
+		View layout = inflater.inflate(R.layout.toast_layout,
+				(ViewGroup) activity.findViewById(R.id.toast_layout_root));
+
+		ImageView image = (ImageView) layout.findViewById(R.id.image);
+		if (icon != -1) {
+			image.setImageResource(icon);
+		} else {
+			image.setImageResource(R.drawable.ic_launcher);
+		}
+		
+		TextView text = (TextView) layout.findViewById(R.id.text);
+		text.setText(activity.getString(message));
+
+		DisplayMetrics metrics = new DisplayMetrics();
+		activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
+		final float scale = activity.getResources().getDisplayMetrics().density;
+		int toastPixels = (int) ((metrics.widthPixels * scale + 0.5f) / 14);
+
+		Toast toast = new Toast(activity);
+		toast.setGravity(Gravity.BOTTOM, 0, toastPixels);
+		toast.setDuration(Toast.LENGTH_SHORT);
+		toast.setView(layout);
+		toast.show();
+	}
+
 }
diff --git a/shell/debug/AndroidManifest.xml b/shell/debug/AndroidManifest.xml
index 2acdba003..57a016c4f 100644
--- a/shell/debug/AndroidManifest.xml
+++ b/shell/debug/AndroidManifest.xml
@@ -9,18 +9,38 @@
         android:targetSdkVersion="18" />
 
     <uses-permission android:name="android.permission.READ_LOGS" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+    <permission
+        android:name="com.reicast.emulator.debug.permission.C2D_MESSAGE"
+        android:protectionLevel="signature" />
+    <uses-permission android:name="com.reicast.emulator.debug.permission.C2D_MESSAGE" />
 
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name" >
-        <activity android:name=".Debugger" >
+        android:label="@string/app_name">
+        <activity android:name=".Debug"
+            android:excludeFromRecents="true"
+            android:theme="@style/Theme.PanelTheme" >
             <intent-filter>
-                <action android:name="com.reicast.emulator.DEBUG" />
+                <action android:name="reicast.emulator.DEBUG" />
+                <action android:name="reicast.emulator.NOTIFY" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+        <receiver
+            android:name=".GcmBroadcastReceiver"
+            android:permission="com.google.android.c2dm.permission.SEND" >
+            <intent-filter>
+                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+
+                <category android:name="com.reicast.emulator.debug" />
+            </intent-filter>
+        </receiver>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/shell/debug/build.xml b/shell/debug/build.xml
index 8164f2645..35d10a74f 100644
--- a/shell/debug/build.xml
+++ b/shell/debug/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="reicast-debugger" default="help">
+<project name="reicast-debug" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
diff --git a/shell/debug/res/drawable/gradient_bg.xml b/shell/debug/res/drawable/gradient_bg.xml
new file mode 100755
index 000000000..1a64c34a5
--- /dev/null
+++ b/shell/debug/res/drawable/gradient_bg.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <!-- Gradient Bg for listrow -->
+    <gradient
+        android:angle="270"
+        android:centerColor="#e7e7e8"
+        android:endColor="#cfcfcf"
+        android:startColor="#f1f1f2" />
+
+</shape>
\ No newline at end of file
diff --git a/shell/debug/res/drawable/gradient_bg_hover.xml b/shell/debug/res/drawable/gradient_bg_hover.xml
new file mode 100755
index 000000000..aab77af2e
--- /dev/null
+++ b/shell/debug/res/drawable/gradient_bg_hover.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <!-- Gradient BgColor for listrow Selected -->
+    <gradient
+        android:angle="270"
+        android:centerColor="#3f7fd7"
+        android:endColor="#5699f6"
+        android:startColor="#5699f6" />
+
+</shape>
\ No newline at end of file
diff --git a/shell/debug/res/drawable/image_bg.xml b/shell/debug/res/drawable/image_bg.xml
new file mode 100755
index 000000000..a1004de21
--- /dev/null
+++ b/shell/debug/res/drawable/image_bg.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item>
+        <shape android:shape="rectangle" >
+            <stroke
+                android:width="1dp"
+                android:color="#dbdbdc" />
+
+            <solid android:color="#FFFFFF" />
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/shell/debug/res/drawable/list_selector.xml b/shell/debug/res/drawable/list_selector.xml
new file mode 100755
index 000000000..fb1560c2e
--- /dev/null
+++ b/shell/debug/res/drawable/list_selector.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Selector style for listrow -->
+    <item android:drawable="@drawable/gradient_bg" android:state_pressed="false" android:state_selected="false"/>
+    <item android:drawable="@drawable/gradient_bg_hover" android:state_pressed="true"/>
+    <item android:drawable="@drawable/gradient_bg_hover" android:state_pressed="false" android:state_selected="true"/>
+
+</selector>
\ No newline at end of file
diff --git a/shell/debug/res/layout/dialog_item.xml b/shell/debug/res/layout/dialog_item.xml
new file mode 100644
index 000000000..a18331bd9
--- /dev/null
+++ b/shell/debug/res/layout/dialog_item.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/list_selector"
+    android:orientation="horizontal"
+    android:padding="5dip" >
+
+    <!-- ListRow Left Thumbnail image -->
+
+    <LinearLayout
+        android:id="@+id/thumbnail"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_marginRight="5dip"
+        android:background="@drawable/image_bg"
+        android:padding="3dip" >
+
+        <ImageView
+            android:id="@+id/list_image"
+            android:contentDescription="@+id/icon"
+            android:layout_width="60dip"
+            android:layout_height="60dip"
+            android:gravity="center"
+            android:src="@drawable/ic_launcher" />
+    </LinearLayout>
+    <!-- Main Item Content -->
+    
+    <TextView
+        android:textIsSelectable="false"
+        android:id="@+id/item_name"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/thumbnail"
+        android:layout_toRightOf="@+id/thumbnail"
+        android:textColor="#040404"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        android:typeface="sans"
+        android:paddingLeft="2dip" />
+
+    <TextView
+        android:textIsSelectable="false"
+        android:id="@+id/item_content"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/item_name"
+        android:layout_marginTop="1dip"
+        android:layout_toRightOf="@+id/thumbnail"
+        android:textColor="#343434"
+        android:textSize="12sp"
+        android:textStyle="bold"
+        android:paddingLeft="2dip" />
+   
+
+</RelativeLayout>
diff --git a/shell/debug/res/layout/dialog_message.xml b/shell/debug/res/layout/dialog_message.xml
new file mode 100644
index 000000000..db9d185ad
--- /dev/null
+++ b/shell/debug/res/layout/dialog_message.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:fitsSystemWindows="true"
+    android:orientation="vertical" >
+
+    <EditText
+        android:id="@+id/txt_message"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_weight="0.25"
+        android:ems="10"
+        android:hint="Enter Broadcast Message"
+        android:inputType="textCapSentences"
+        android:maxLines="4"
+        android:minLines="2" />
+
+    <Button
+        android:id="@+id/txt_button"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_weight="0.25"
+        android:ems="10"
+        android:text="Submit Message" />
+
+    <ListView
+        android:id="@+id/dialog_list"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_weight="1.0"
+        android:divider="#b5b5b5"
+        android:dividerHeight="1dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/shell/debug/res/values/colors.xml b/shell/debug/res/values/colors.xml
new file mode 100755
index 000000000..2a8bfd4d4
--- /dev/null
+++ b/shell/debug/res/values/colors.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<color name="white">#50FFFFFF</color>
+    <color name="black">#B0000000</color>
+</resources>
diff --git a/shell/debug/res/values/strings.xml b/shell/debug/res/values/strings.xml
index c6e95d3ac..4f3c86c9c 100644
--- a/shell/debug/res/values/strings.xml
+++ b/shell/debug/res/values/strings.xml
@@ -1,4 +1,4 @@
 <resources>
 
-    <string name="app_name">reicast debugger</string>
+    <string name="app_name">reicast debug</string>
 </resources>
diff --git a/shell/debug/res/values/themes.xml b/shell/debug/res/values/themes.xml
new file mode 100644
index 000000000..1898eb1dc
--- /dev/null
+++ b/shell/debug/res/values/themes.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    
+    <style name="Theme.PanelTheme" parent="android:Theme.NoTitleBar">
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@color/black</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/shell/debug/src/com/reicast/emulator/debug/Debug.java b/shell/debug/src/com/reicast/emulator/debug/Debug.java
new file mode 100644
index 000000000..c6cb97a74
--- /dev/null
+++ b/shell/debug/src/com/reicast/emulator/debug/Debug.java
@@ -0,0 +1,554 @@
+package com.reicast.emulator.debug;
+
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.net.NetworkInterface;
+import java.net.ProtocolException;
+import java.net.URL;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Pattern;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.ResponseHandler;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.util.InetAddressUtils;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.message.BasicNameValuePair;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.util.Patterns;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.GooglePlayServicesUtil;
+import com.google.android.gms.gcm.GoogleCloudMessaging;
+
+public class Debug extends Activity {
+
+	public static final String APP_TAG = "reicast-debug";
+
+	public static final String EXTRA_MESSAGE = "message";
+	private static final String PROPERTY_APP_VERSION = "appVersion";
+	private static final String PROPERTY_ON_SERVER_EXPIRATION_TIME = "onServerExpirationTimeMs";
+	static final String SERVER_URL = "http://twisted.dyndns.tv:3194/ReicastBot/plugin/register.php";
+	public static final long REGISTRATION_EXPIRY_TIME_MS = 1000 * 3600 * 24 * 30;
+	String SENDER_ID = "847786358946";
+	static final String TAG = "GCM::Service";
+	GoogleCloudMessaging gcm;
+	public static final String REG_ID = "registration_id";
+	AtomicInteger msgId = new AtomicInteger();
+
+	public static final String cloudUrl = "http://twisted.dyndns.tv:3194/ReicastBot/plugin/submit.php";
+	public static final String numberUrl = "http://twisted.dyndns.tv:3194/ReicastBot/plugin/number.php";
+	public static final String archiveUrl = "http://twisted.dyndns.tv:3194/ReicastBot/plugin/archive.php";
+
+	public static final String PREF_IDENTITY = "pref_user_identity";
+
+	private Context mContext;
+	private SharedPreferences mPrefs;
+
+	private ExpandableListView exlist = new ExpandableListView();
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.dialog_message);
+		mContext = this.getApplicationContext();
+		mPrefs = PreferenceManager.getDefaultSharedPreferences(mContext);
+		int resultCode = GooglePlayServicesUtil
+				.isGooglePlayServicesAvailable(mContext);
+		if (resultCode == ConnectionResult.SUCCESS) {
+			String regid = getRegistrationId(mContext);
+			if (regid.length() == 0) {
+				RegisterTask mRegisterTask = new RegisterTask();
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+					mRegisterTask
+							.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+				} else {
+					mRegisterTask.execute();
+				}
+			}
+			submitGcmUser(regid, false);
+			gcm = GoogleCloudMessaging.getInstance(mContext);
+		} else {
+			GooglePlayServicesUtil.getErrorDialog(resultCode, this, 1).show();
+		}
+		RequestArchive mRequestArchive = new RequestArchive() {
+			@Override
+			protected void onPostExecute(List<String[]> jsonArray) {
+				if (jsonArray != null && !jsonArray.isEmpty()) {
+					ListView wrapper = (ListView) findViewById(R.id.dialog_list);
+					MessageAdapter adapter = new MessageAdapter(mContext, jsonArray);
+					wrapper.setAdapter(adapter);
+					adapter.notifyDataSetChanged();
+					exlist.setListViewHeightBasedOnChildren(wrapper);
+					wrapper.invalidate();
+				}
+			}
+		};
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+			mRequestArchive.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, archiveUrl);
+		} else {
+			mRequestArchive.execute(archiveUrl);
+		}
+		final EditText msgEntry = (EditText) findViewById(R.id.txt_message);
+		Button submit = (Button) findViewById(R.id.txt_button);
+		submit.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				if (msgEntry.getText() != null
+						&& !msgEntry.getText().toString().equals("")) {
+					String message = msgEntry.getText().toString();
+					submitGcmBroadcast(message);
+					msgEntry.setText("");
+				}
+			}
+			
+		});
+	}
+
+	public class MessageAdapter extends BaseAdapter {
+		@SuppressWarnings("unused")
+		private Context mContext;
+		private List<String[]> data;
+
+		public MessageAdapter(Context c, List<String[]> d) {
+			mContext = c;
+			data = d;
+		}
+
+		public int getCount() {
+			return data.size();
+		}
+
+		public Object getItem(int position) {
+			return position;
+		}
+
+		public long getItemId(int position) {
+			return position;
+		}
+
+		public View getView(final int position, View convertView,
+				ViewGroup parent) {
+			System.gc();
+
+			LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+			View vi = convertView;
+			if (convertView == null)
+				vi = inflater.inflate(R.layout.dialog_item, null);
+
+			String[] message = data.get(position);
+
+			TextView itemName = (TextView) vi
+					.findViewById(R.id.item_name);
+			itemName.setText(message[0] + " [" + message[2] + "]");
+
+			TextView itemContent = (TextView) vi
+					.findViewById(R.id.item_content);
+			itemContent.setText(message[1]);
+
+			return vi;
+		}
+	}
+
+	private String getRegistrationId(Context context) {
+		String registrationId = mPrefs.getString(REG_ID, "");
+		if (registrationId.length() == 0) {
+			return "";
+		}
+		// check if app was updated; if so, it must clear registration id to
+		// avoid a race condition if GCM sends a message
+		int registeredVersion = mPrefs.getInt(PROPERTY_APP_VERSION,
+				Integer.MIN_VALUE);
+		int currentVersion = getAppVersion(context);
+		if (registeredVersion != currentVersion || isRegistrationExpired()) {
+			return "";
+		}
+		return registrationId;
+	}
+
+	private static int getAppVersion(Context context) {
+		try {
+			PackageInfo packageInfo = context.getPackageManager()
+					.getPackageInfo(context.getPackageName(), 0);
+			return packageInfo.versionCode;
+		} catch (NameNotFoundException e) {
+			// should never happen
+			throw new RuntimeException("Could not get package name: " + e);
+		}
+	}
+
+	private boolean isRegistrationExpired() {
+		long expirationTime = mPrefs.getLong(
+				PROPERTY_ON_SERVER_EXPIRATION_TIME, -1);
+		return System.currentTimeMillis() > expirationTime;
+	}
+
+	public class RegisterTask extends AsyncTask<String, Integer, String> {
+		@SuppressWarnings("unchecked")
+		@Override
+		protected String doInBackground(String... params) {
+			try {
+				if (gcm == null) {
+					gcm = GoogleCloudMessaging.getInstance(mContext);
+				}
+				String regid = gcm.register(SENDER_ID);
+				Log.d(APP_TAG, "Registration id: " + regid);
+				setRegistrationId(mContext, regid);
+				String possibleEmail = getAccountEmail();
+				if (possibleEmail != null) {
+					String serverUrl = SERVER_URL;
+					Map<String, String> user = new HashMap<String, String>();
+					user.put("regId", regid);
+					user.put("email", possibleEmail);
+					PostServer mPostServer = new PostServer(serverUrl);
+					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+						mPostServer.executeOnExecutor(
+								AsyncTask.THREAD_POOL_EXECUTOR, user);
+					} else {
+						mPostServer.execute(user);
+					}
+				}
+				return regid;
+			} catch (IOException ex) {
+				Log.d(APP_TAG, "Error :" + ex.getMessage());
+			}
+			return null;
+		}
+
+		@Override
+		protected void onPostExecute(String regid) {
+			if (regid != null && !regid.equals(null)) {
+				submitGcmUser(regid, false);
+			}
+		}
+	};
+
+	private class PostServer extends
+			AsyncTask<Map<String, String>, Integer, String> {
+
+		private String serverUrl;
+
+		PostServer(String serverUrl) {
+			this.serverUrl = serverUrl;
+		}
+
+		@Override
+		protected String doInBackground(Map<String, String>... params) {
+			URL url;
+			try {
+				url = new URL(serverUrl);
+			} catch (MalformedURLException e) {
+				throw new IllegalArgumentException("invalid url: " + serverUrl);
+			}
+			StringBuilder bodyBuilder = new StringBuilder();
+			Iterator<Entry<String, String>> iterator = params[0].entrySet()
+					.iterator();
+			while (iterator.hasNext()) {
+				Entry<String, String> param = iterator.next();
+				bodyBuilder.append(param.getKey()).append('=')
+						.append(param.getValue());
+				if (iterator.hasNext()) {
+					bodyBuilder.append('&');
+				}
+			}
+			String body = bodyBuilder.toString();
+			byte[] bytes = body.getBytes();
+			HttpURLConnection conn = null;
+			try {
+				conn = (HttpURLConnection) url.openConnection();
+				conn.setDoOutput(true);
+				conn.setUseCaches(false);
+				conn.setFixedLengthStreamingMode(bytes.length);
+				conn.setRequestMethod("POST");
+				conn.setRequestProperty("Content-Type",
+						"application/x-www-form-urlencoded;charset=UTF-8");
+				// post the request
+				OutputStream out = conn.getOutputStream();
+				out.write(bytes);
+				out.close();
+				// handle the response
+				int status = conn.getResponseCode();
+				if (status != 200) {
+					throw new IOException("Post failed with error code "
+							+ status);
+				}
+				conn.disconnect();
+			} catch (ProtocolException p) {
+				p.printStackTrace();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+			return null;
+		}
+
+		@Override
+		protected void onPostExecute(String results) {
+
+		}
+	}
+
+	private void setRegistrationId(Context context, String regId) {
+		int appVersion = getAppVersion(context);
+		SharedPreferences.Editor editor = mPrefs.edit();
+		editor.putString(REG_ID, regId);
+		editor.putInt(PROPERTY_APP_VERSION, appVersion);
+		long expirationTime = System.currentTimeMillis()
+				+ REGISTRATION_EXPIRY_TIME_MS;
+		editor.putLong(PROPERTY_ON_SERVER_EXPIRATION_TIME, expirationTime);
+		editor.commit();
+	}
+
+	public void submitGcmBroadcast(String message) {
+		CloudMessage mCloudMessage = new CloudMessage();
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+			mCloudMessage.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
+					message);
+		} else {
+			mCloudMessage.execute(message);
+		}
+	}
+
+	public class CloudMessage extends AsyncTask<String, Integer, Object> {
+
+		@Override
+		protected Object doInBackground(String... params) {
+			try {
+				ArrayList<NameValuePair> mPairs = new ArrayList<NameValuePair>();
+				boolean hasIdentitiy = false;
+				String identity = mPrefs
+						.getString(PREF_IDENTITY, "?");
+				if (!identity.equals("?")) {
+					mPairs.add(new BasicNameValuePair("sender", "reicast tag #" + identity));
+					hasIdentitiy = true;
+				} else {
+					String ip = getSenderIPAddress(true);
+					if (ip != null && !ip.equals(null)) {
+						mPairs.add(new BasicNameValuePair("sender", ip));
+						hasIdentitiy = true;
+					}
+				}
+				if (hasIdentitiy) {
+					mPairs.add(new BasicNameValuePair("message", params[0]));
+					HttpClient client = new DefaultHttpClient();
+					HttpPost post = new HttpPost(cloudUrl);
+					post.setEntity(new UrlEncodedFormEntity(mPairs));
+					return client.execute(post, new ResponseHandler<Object>() {
+
+						@Override
+						public Object handleResponse(HttpResponse response)
+								throws ClientProtocolException, IOException {
+							return response.toString();
+						}
+					});
+				}
+			} catch (MalformedURLException e) {
+				Log.d(APP_TAG, "MalformedURLException: " + e);
+			} catch (IOException e) {
+				Log.d(APP_TAG, "IOException: " + e);
+			} catch (Exception e) {
+				Log.d(APP_TAG, "Exception: " + e);
+			}
+			return null;
+		}
+
+		@Override
+		protected void onPostExecute(Object message) {
+			if (message != null && !message.equals(null)) {
+				Log.d(APP_TAG, "GCM: " + message.toString());
+			}
+		}
+
+	}
+
+	public void submitGcmUser(String regid, boolean speak) {
+		CloudSelecao mCloudSelecao = new CloudSelecao(speak);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+			mCloudSelecao.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
+					regid);
+		} else {
+			mCloudSelecao.execute(regid);
+		}
+	}
+
+	public class CloudSelecao extends AsyncTask<String, Integer, Object> {
+
+		private boolean speak;
+
+		CloudSelecao(boolean speak) {
+			this.speak = speak;
+		}
+
+		@Override
+		protected Object doInBackground(String... params) {
+			try {
+				ArrayList<NameValuePair> mPairs = new ArrayList<NameValuePair>();
+				mPairs.add(new BasicNameValuePair("gcm_regid", params[0]));
+				HttpClient client = new DefaultHttpClient();
+				HttpPost post = new HttpPost(numberUrl);
+				post.setEntity(new UrlEncodedFormEntity(mPairs));
+				return client.execute(post, new ResponseHandler<Object>() {
+
+					@Override
+					public Object handleResponse(HttpResponse response)
+							throws ClientProtocolException, IOException {
+						HttpEntity resEntitiy = response.getEntity();
+						if (resEntitiy.getContentLength() > 0) {
+							StringBuilder sb = new StringBuilder();
+							try {
+								BufferedReader reader = new BufferedReader(
+										new InputStreamReader(resEntitiy
+												.getContent()), 65728);
+								String line = null;
+
+								while ((line = reader.readLine()) != null) {
+									sb.append(line);
+								}
+							} catch (IOException e) {
+								e.printStackTrace();
+								return null;
+							} catch (Exception e) {
+								e.printStackTrace();
+								return null;
+							}
+							return sb.toString();
+						} else {
+							return null;
+						}
+					}
+				});
+			} catch (MalformedURLException e) {
+				Log.d(APP_TAG, "MalformedURLException: " + e);
+			} catch (IOException e) {
+				Log.d(APP_TAG, "IOException: " + e);
+			} catch (Exception e) {
+				Log.d(APP_TAG, "Exception: " + e);
+			}
+			return null;
+		}
+
+		@Override
+		protected void onPostExecute(Object response) {
+			if (response != null && !response.equals(null)) {
+				String identity = response.toString();
+				if (!identity.equals("Err")) {
+					mPrefs.edit().putString(PREF_IDENTITY, identity)
+							.commit();
+				}
+				Log.d(APP_TAG, "reicast tag #" + identity);
+			}
+		}
+
+	}
+
+	public String getAccountEmail() {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ECLAIR) {
+			Pattern emailPattern = Patterns.EMAIL_ADDRESS; // API level 8+
+			Account[] accounts = AccountManager.get(mContext).getAccounts();
+			for (Account account : accounts) {
+				if (emailPattern.matcher(account.name).matches()) {
+					if (account.name.toLowerCase(Locale.getDefault()).endsWith(
+							"@gmail.com")) {
+						return account.name;
+					}
+				}
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Obtain the current device IP address from mobile interface
+	 * 
+	 * @param useIPv4 Specify the infrastructure to return from
+	 * 
+	 * @return String The IP address associated with this device
+	 */
+		public static String getSenderIPAddress(boolean useIPv4) {
+			try {
+				List<NetworkInterface> interfaces = Collections
+						.list(NetworkInterface.getNetworkInterfaces());
+				for (NetworkInterface intf : interfaces) {
+					List<InetAddress> addrs = Collections.list(intf
+							.getInetAddresses());
+					for (InetAddress addr : addrs) {
+						if (!addr.isLoopbackAddress()) {
+							String sAddr = addr.getHostAddress().toUpperCase(
+									Locale.getDefault());
+							boolean isIPv4 = InetAddressUtils.isIPv4Address(sAddr);
+							if (useIPv4) {
+								if (isIPv4)
+									return sAddr;
+							} else {
+								if (!isIPv4) {
+									int delim = sAddr.indexOf('%');
+									return delim < 0 ? sAddr : sAddr.substring(0,
+											delim);
+								}
+							}
+						}
+					}
+				}
+			} catch (Exception ex) {
+
+			}
+			return null;
+		}
+
+	@Override
+	protected void onPause() {
+		super.onPause();
+	}
+
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+	}
+}
diff --git a/shell/debug/src/com/reicast/emulator/debug/Debugger.java b/shell/debug/src/com/reicast/emulator/debug/Debugger.java
deleted file mode 100644
index 8d598ced9..000000000
--- a/shell/debug/src/com/reicast/emulator/debug/Debugger.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.reicast.emulator.debug;
-
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class Debugger extends Activity {
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-	}
-
-	@Override
-	protected void onPause() {
-		super.onPause();
-	}
-
-	@Override
-	protected void onDestroy() {
-		super.onDestroy();
-	}
-
-	@Override
-	protected void onResume() {
-		super.onResume();
-	}
-}
diff --git a/shell/debug/src/com/reicast/emulator/debug/ExpandableListView.java b/shell/debug/src/com/reicast/emulator/debug/ExpandableListView.java
new file mode 100644
index 000000000..323325907
--- /dev/null
+++ b/shell/debug/src/com/reicast/emulator/debug/ExpandableListView.java
@@ -0,0 +1,33 @@
+package com.reicast.emulator.debug;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+
+public class ExpandableListView {
+
+	public void setListViewHeightBasedOnChildren(ListView listView) {
+		ListAdapter listAdapter = listView.getAdapter();
+		if (listAdapter == null) {
+			return;
+		}
+
+		int totalHeight = listView.getPaddingTop()
+				+ listView.getPaddingBottom();
+		for (int i = 0; i < listAdapter.getCount(); i++) {
+			View listItem = listAdapter.getView(i, null, listView);
+			if (listItem instanceof ViewGroup)
+				listItem.setLayoutParams(new LayoutParams(
+						LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
+			listItem.measure(0, 0);
+			totalHeight += listItem.getMeasuredHeight();
+		}
+
+		ViewGroup.LayoutParams params = listView.getLayoutParams();
+		params.height = totalHeight
+				+ (listView.getDividerHeight() * (listAdapter.getCount() - 1));
+		listView.setLayoutParams(params);
+	}
+}
\ No newline at end of file
diff --git a/shell/debug/src/com/reicast/emulator/debug/GcmBroadcastReceiver.java b/shell/debug/src/com/reicast/emulator/debug/GcmBroadcastReceiver.java
new file mode 100644
index 000000000..c670eda48
--- /dev/null
+++ b/shell/debug/src/com/reicast/emulator/debug/GcmBroadcastReceiver.java
@@ -0,0 +1,89 @@
+package com.reicast.emulator.debug;
+
+import android.app.Activity;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v4.app.NotificationCompat;
+import android.util.Log;
+
+import com.google.android.gms.gcm.GoogleCloudMessaging;
+
+public class GcmBroadcastReceiver extends BroadcastReceiver {
+	static final String TAG = "GCM::Service";
+	Context mContext;
+
+	@Override
+	public void onReceive(Context context, Intent intent) {
+		GoogleCloudMessaging gcm = GoogleCloudMessaging.getInstance(context);
+		mContext = context.getApplicationContext();
+		String messageType = gcm.getMessageType(intent);
+		if (GoogleCloudMessaging.MESSAGE_TYPE_SEND_ERROR.equals(messageType)) {
+			// sendNotification(intent.getExtras().toString());
+		} else if (GoogleCloudMessaging.MESSAGE_TYPE_DELETED
+				.equals(messageType)) {
+			// sendNotification(intent.getExtras().toString());
+		} else {
+			Bundle extras = intent.getExtras();
+			if (extras.getString("message") != null) {
+				String sender = extras.getString("sender");
+				Log.d(TAG, "Sender: " + sender);
+				String message = extras.getString("message");
+				if (!message.equals("")) {
+					if (sender.contains("reicast tag #")) {
+						sendNotification(sender, message);
+					}
+				}
+			}
+		}
+		setResultCode(Activity.RESULT_OK);
+	}
+
+	// Put the GCM message into a notification and post it.
+	private void sendNotification(String sender, String message) {
+		SharedPreferences prefs = PreferenceManager
+				.getDefaultSharedPreferences(mContext);
+		final String number = sender.replace("reicast tag #", "");
+		long timestamp = System.currentTimeMillis();
+		int reference = (int) timestamp;
+		if (prefs.getBoolean("enable_messaging", true)) {
+			NotificationManager notificationManager = (NotificationManager) mContext
+					.getSystemService(Context.NOTIFICATION_SERVICE);
+			String title = "New reicast message!";
+			Notification notification;
+			Intent notificationIntent = new Intent(mContext, Debug.class);
+			// notificationIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+			notificationIntent.setAction("reicast.emulator.NOTIFY");
+			notificationIntent.putExtra("sender", sender);
+			notificationIntent.putExtra("message", message);
+			notificationIntent.putExtra("context", "GCM");
+			PendingIntent intent = PendingIntent.getActivity(mContext, 0,
+					notificationIntent, PendingIntent.FLAG_ONE_SHOT);
+			NotificationCompat.Builder builder = new NotificationCompat.Builder(
+					mContext);
+			builder.setTicker(sender).setWhen(timestamp).setContentTitle(title)
+					.setContentText(message).setAutoCancel(true)
+					.setContentIntent(intent)
+					.setSmallIcon(R.drawable.ic_launcher)
+					.setLights(0xff00ff00, 200, 800)
+					.setPriority(Notification.PRIORITY_HIGH);
+
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+				notification = new NotificationCompat.BigTextStyle(builder)
+						.bigText(message).build();
+			} else {
+				notification = builder.build();
+			}
+			notification.flags |= Notification.FLAG_AUTO_CANCEL;
+
+			notificationManager.notify(reference, notification);
+		}
+	}
+}
diff --git a/shell/debug/src/com/reicast/emulator/debug/RequestArchive.java b/shell/debug/src/com/reicast/emulator/debug/RequestArchive.java
new file mode 100644
index 000000000..8094371c1
--- /dev/null
+++ b/shell/debug/src/com/reicast/emulator/debug/RequestArchive.java
@@ -0,0 +1,123 @@
+/* ====================================================================
+ * Copyright (c) 2012-2013 Lounge Katt Entertainment.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by Lounge Katt for use
+ *    by authorized development projects. (http://loungekatt.com/)"
+ *
+ * 4. The names "Lounge Katt", "TwistedUmbrella", and "StarKissed"  
+ *    must not be used to endorse or promote products derived from this 
+ *    software without prior written permission. For written permission,
+ *    please contact admin@loungekatt.com.
+ *
+ * 5. Products derived from this software may not be called "Lounge Katt"
+ *    nor may "Lounge Katt" appear in their names without prior written
+ *    permission of Lounge Katt Entertainment.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Lounge Katt for use
+ *    by authorized development projects. (http://loungekatt.com/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY Lounge Katt ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * The license and distribution terms for any publicly available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution license
+ * [including the GNU Public License.] Content not subject to these terms is
+ * subject to to the terms and conditions of the Apache License, Version 2.0.
+ */
+
+package com.reicast.emulator.debug;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.ResponseHandler;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.BasicResponseHandler;
+import org.apache.http.impl.client.DefaultHttpClient;
+
+import android.annotation.SuppressLint;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.StrictMode;
+import android.util.Log;
+
+public class RequestArchive extends AsyncTask<String, String, List<String[]>> {
+
+	@SuppressLint("NewApi")
+	protected void onPreExecute() {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
+			StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder()
+					.permitAll().build();
+			StrictMode.setThreadPolicy(policy);
+		}
+	}
+
+	@Override
+	protected List<String[]> doInBackground(String... urls) {
+		try {
+			List<String[]> message = new ArrayList<String[]>();
+			HttpClient client = new DefaultHttpClient();
+			HttpPost post = new HttpPost(urls[0]);
+			ResponseHandler<String> responseHandler = new BasicResponseHandler();
+			String response = client.execute(post, responseHandler);
+			if (response.contains("[") && response.contains("]")) {
+				String[] jsonString = response.split(" , ");
+				for (String jsonText : jsonString) {
+					if (jsonText.contains("[\"")) {
+						jsonText = jsonText.replace("[\"", "");
+					}
+					if (jsonText.contains("\"]")) {
+						jsonText = jsonText.replace("\"]", "");
+					}
+					message.add(jsonText.split("\",\""));
+				}
+				return message;
+			}
+			return null;
+
+		} catch (MalformedURLException e) {
+			Log.d("reicast-debug", "MalformedURLException: " + e);
+		} catch (IOException e) {
+			Log.d("reicast-debug", "IOException: " + e);
+		} catch (Exception e) {
+			Log.d("reicast-debug", "Exception: " + e);
+		}
+		return null;
+	}
+
+	@Override
+	protected void onPostExecute(List<String[]> jsonArray) {
+		super.onPostExecute(jsonArray);
+	}
+}
\ No newline at end of file

From 60df320f4c5e3593457e9bb2871e897a1fa55c31 Mon Sep 17 00:00:00 2001
From: TwistedUmbrella <twistedumbrella@gmail.com>
Date: Mon, 3 Mar 2014 11:58:12 -0500
Subject: [PATCH 2/7] Add expanded message when clicking on an individual item

---
 .../src/com/reicast/emulator/debug/Debug.java | 149 +++++++++++-------
 1 file changed, 96 insertions(+), 53 deletions(-)

diff --git a/shell/debug/src/com/reicast/emulator/debug/Debug.java b/shell/debug/src/com/reicast/emulator/debug/Debug.java
index c6cb97a74..bc2fae494 100644
--- a/shell/debug/src/com/reicast/emulator/debug/Debug.java
+++ b/shell/debug/src/com/reicast/emulator/debug/Debug.java
@@ -1,6 +1,5 @@
 package com.reicast.emulator.debug;
 
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -11,11 +10,8 @@ import java.net.MalformedURLException;
 import java.net.NetworkInterface;
 import java.net.ProtocolException;
 import java.net.URL;
-import java.text.DateFormat;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -40,20 +36,27 @@ import org.apache.http.message.BasicNameValuePair;
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.util.Patterns;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.EditText;
@@ -109,7 +112,7 @@ public class Debug extends Activity {
 					mRegisterTask.execute();
 				}
 			}
-			submitGcmUser(regid, false);
+			submitGcmUser(regid);
 			gcm = GoogleCloudMessaging.getInstance(mContext);
 		} else {
 			GooglePlayServicesUtil.getErrorDialog(resultCode, this, 1).show();
@@ -119,7 +122,9 @@ public class Debug extends Activity {
 			protected void onPostExecute(List<String[]> jsonArray) {
 				if (jsonArray != null && !jsonArray.isEmpty()) {
 					ListView wrapper = (ListView) findViewById(R.id.dialog_list);
-					MessageAdapter adapter = new MessageAdapter(mContext, jsonArray);
+					DisplayDialog dialog = new DisplayDialog(Debug.this);
+					MessageAdapter adapter = new MessageAdapter(mContext,
+							jsonArray, dialog);
 					wrapper.setAdapter(adapter);
 					adapter.notifyDataSetChanged();
 					exlist.setListViewHeightBasedOnChildren(wrapper);
@@ -128,7 +133,8 @@ public class Debug extends Activity {
 			}
 		};
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-			mRequestArchive.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, archiveUrl);
+			mRequestArchive.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
+					archiveUrl);
 		} else {
 			mRequestArchive.execute(archiveUrl);
 		}
@@ -144,7 +150,7 @@ public class Debug extends Activity {
 					msgEntry.setText("");
 				}
 			}
-			
+
 		});
 	}
 
@@ -152,10 +158,12 @@ public class Debug extends Activity {
 		@SuppressWarnings("unused")
 		private Context mContext;
 		private List<String[]> data;
+		private DisplayDialog note;
 
-		public MessageAdapter(Context c, List<String[]> d) {
+		public MessageAdapter(Context c, List<String[]> d, DisplayDialog n) {
 			mContext = c;
 			data = d;
+			note = n;
 		}
 
 		public int getCount() {
@@ -180,19 +188,60 @@ public class Debug extends Activity {
 				vi = inflater.inflate(R.layout.dialog_item, null);
 
 			String[] message = data.get(position);
+			final String title = message[0] + " [" + message[2] + "]";
+			final String content = message[1];
 
-			TextView itemName = (TextView) vi
-					.findViewById(R.id.item_name);
-			itemName.setText(message[0] + " [" + message[2] + "]");
+			TextView itemName = (TextView) vi.findViewById(R.id.item_name);
+			itemName.setText(title);
 
 			TextView itemContent = (TextView) vi
 					.findViewById(R.id.item_content);
-			itemContent.setText(message[1]);
+			itemContent.setText(content);
+
+			vi.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					new Handler().post(new Runnable() {
+						public void run() {
+							note.showMessage(title, content);
+						}
+					});
+				}
+			});
 
 			return vi;
 		}
 	}
 
+	public class DisplayDialog extends AlertDialog.Builder {
+
+		public DisplayDialog(Context context) {
+			super(context);
+		}
+
+		public void showMessage(String title, String content) {
+
+			this.setTitle(title);
+			this.setMessage(content);
+			this.setNegativeButton("Dismiss",
+					new DialogInterface.OnClickListener() {
+						public void onClick(DialogInterface dialog, int which) {
+							dialog.dismiss();
+						}
+					});
+			this.setPositiveButton(null, null);
+			this.setOnKeyListener(new Dialog.OnKeyListener() {
+				public boolean onKey(DialogInterface dialog, int keyCode,
+						KeyEvent event) {
+					dialog.dismiss();
+					return true;
+				}
+			});
+			this.create();
+			this.show();
+		}
+	}
+
 	private String getRegistrationId(Context context) {
 		String registrationId = mPrefs.getString(REG_ID, "");
 		if (registrationId.length() == 0) {
@@ -261,7 +310,7 @@ public class Debug extends Activity {
 		@Override
 		protected void onPostExecute(String regid) {
 			if (regid != null && !regid.equals(null)) {
-				submitGcmUser(regid, false);
+				submitGcmUser(regid);
 			}
 		}
 	};
@@ -358,10 +407,10 @@ public class Debug extends Activity {
 			try {
 				ArrayList<NameValuePair> mPairs = new ArrayList<NameValuePair>();
 				boolean hasIdentitiy = false;
-				String identity = mPrefs
-						.getString(PREF_IDENTITY, "?");
+				String identity = mPrefs.getString(PREF_IDENTITY, "?");
 				if (!identity.equals("?")) {
-					mPairs.add(new BasicNameValuePair("sender", "reicast tag #" + identity));
+					mPairs.add(new BasicNameValuePair("sender", "reicast tag #"
+							+ identity));
 					hasIdentitiy = true;
 				} else {
 					String ip = getSenderIPAddress(true);
@@ -403,8 +452,8 @@ public class Debug extends Activity {
 
 	}
 
-	public void submitGcmUser(String regid, boolean speak) {
-		CloudSelecao mCloudSelecao = new CloudSelecao(speak);
+	public void submitGcmUser(String regid) {
+		CloudSelecao mCloudSelecao = new CloudSelecao();
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
 			mCloudSelecao.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
 					regid);
@@ -415,12 +464,6 @@ public class Debug extends Activity {
 
 	public class CloudSelecao extends AsyncTask<String, Integer, Object> {
 
-		private boolean speak;
-
-		CloudSelecao(boolean speak) {
-			this.speak = speak;
-		}
-
 		@Override
 		protected Object doInBackground(String... params) {
 			try {
@@ -474,8 +517,7 @@ public class Debug extends Activity {
 			if (response != null && !response.equals(null)) {
 				String identity = response.toString();
 				if (!identity.equals("Err")) {
-					mPrefs.edit().putString(PREF_IDENTITY, identity)
-							.commit();
+					mPrefs.edit().putString(PREF_IDENTITY, identity).commit();
 				}
 				Log.d(APP_TAG, "reicast tag #" + identity);
 			}
@@ -498,44 +540,45 @@ public class Debug extends Activity {
 		}
 		return null;
 	}
-	
+
 	/**
 	 * Obtain the current device IP address from mobile interface
 	 * 
-	 * @param useIPv4 Specify the infrastructure to return from
+	 * @param useIPv4
+	 *            Specify the infrastructure to return from
 	 * 
 	 * @return String The IP address associated with this device
 	 */
-		public static String getSenderIPAddress(boolean useIPv4) {
-			try {
-				List<NetworkInterface> interfaces = Collections
-						.list(NetworkInterface.getNetworkInterfaces());
-				for (NetworkInterface intf : interfaces) {
-					List<InetAddress> addrs = Collections.list(intf
-							.getInetAddresses());
-					for (InetAddress addr : addrs) {
-						if (!addr.isLoopbackAddress()) {
-							String sAddr = addr.getHostAddress().toUpperCase(
-									Locale.getDefault());
-							boolean isIPv4 = InetAddressUtils.isIPv4Address(sAddr);
-							if (useIPv4) {
-								if (isIPv4)
-									return sAddr;
-							} else {
-								if (!isIPv4) {
-									int delim = sAddr.indexOf('%');
-									return delim < 0 ? sAddr : sAddr.substring(0,
-											delim);
-								}
+	public static String getSenderIPAddress(boolean useIPv4) {
+		try {
+			List<NetworkInterface> interfaces = Collections
+					.list(NetworkInterface.getNetworkInterfaces());
+			for (NetworkInterface intf : interfaces) {
+				List<InetAddress> addrs = Collections.list(intf
+						.getInetAddresses());
+				for (InetAddress addr : addrs) {
+					if (!addr.isLoopbackAddress()) {
+						String sAddr = addr.getHostAddress().toUpperCase(
+								Locale.getDefault());
+						boolean isIPv4 = InetAddressUtils.isIPv4Address(sAddr);
+						if (useIPv4) {
+							if (isIPv4)
+								return sAddr;
+						} else {
+							if (!isIPv4) {
+								int delim = sAddr.indexOf('%');
+								return delim < 0 ? sAddr : sAddr.substring(0,
+										delim);
 							}
 						}
 					}
 				}
-			} catch (Exception ex) {
-
 			}
-			return null;
+		} catch (Exception ex) {
+
 		}
+		return null;
+	}
 
 	@Override
 	protected void onPause() {

From 20291c57e86dcbd499e8038384a5285beeef9112 Mon Sep 17 00:00:00 2001
From: TwistedUmbrella <twistedumbrella@gmail.com>
Date: Mon, 3 Mar 2014 15:08:22 -0500
Subject: [PATCH 3/7] Add the option to disable the debug message notifications

---
 .../switch_bg_disabled_holo_dark.9.png        | Bin 0 -> 249 bytes
 .../switch_bg_focused_holo_dark.9.png         | Bin 0 -> 269 bytes
 .../drawable-hdpi/switch_bg_holo_dark.9.png   | Bin 0 -> 182 bytes
 .../switch_thumb_activated_holo_dark.9.png    | Bin 0 -> 549 bytes
 .../switch_thumb_disabled_holo_dark.9.png     | Bin 0 -> 535 bytes
 .../switch_thumb_holo_dark.9.png              | Bin 0 -> 559 bytes
 .../switch_thumb_pressed_holo_dark.9.png      | Bin 0 -> 566 bytes
 .../switch_bg_disabled_holo_dark.9.png        | Bin 0 -> 206 bytes
 .../switch_bg_focused_holo_dark.9.png         | Bin 0 -> 216 bytes
 .../drawable-ldpi/switch_bg_holo_dark.9.png   | Bin 0 -> 163 bytes
 .../switch_thumb_activated_holo_dark.9.png    | Bin 0 -> 351 bytes
 .../switch_thumb_disabled_holo_dark.9.png     | Bin 0 -> 350 bytes
 .../switch_thumb_holo_dark.9.png              | Bin 0 -> 362 bytes
 .../switch_thumb_pressed_holo_dark.9.png      | Bin 0 -> 362 bytes
 .../switch_bg_disabled_holo_dark.9.png        | Bin 0 -> 255 bytes
 .../switch_bg_focused_holo_dark.9.png         | Bin 0 -> 285 bytes
 .../drawable-xhdpi/switch_bg_holo_dark.9.png  | Bin 0 -> 229 bytes
 .../switch_thumb_activated_holo_dark.9.png    | Bin 0 -> 653 bytes
 .../switch_thumb_disabled_holo_dark.9.png     | Bin 0 -> 633 bytes
 .../switch_thumb_holo_dark.9.png              | Bin 0 -> 687 bytes
 .../switch_thumb_pressed_holo_dark.9.png      | Bin 0 -> 660 bytes
 .../res/drawable/switch_inner_holo_dark.xml   |  22 +
 .../res/drawable/switch_track_holo_dark.xml   |  20 +
 shell/debug/res/layout/dialog_message.xml     |  35 +
 shell/debug/res/values/attrs.xml              |  55 ++
 shell/debug/res/values/strings.xml            |   6 +
 shell/debug/res/values/themes.xml             |  21 +
 .../src/com/reicast/emulator/debug/Debug.java |  20 +-
 .../emulator/debug/GcmBroadcastReceiver.java  |   4 +-
 .../method/AllCapsTransformationMethod.java   |  61 ++
 .../method/TransformationMethodCompat.java    |  37 +
 .../method/TransformationMethodCompat2.java   |  33 +
 shell/debug/src/de/ankri/views/Switch.java    | 890 ++++++++++++++++++
 .../de/ankri/views/TwoStatePreference.java    | 305 ++++++
 34 files changed, 1505 insertions(+), 4 deletions(-)
 create mode 100644 shell/debug/res/drawable-hdpi/switch_bg_disabled_holo_dark.9.png
 create mode 100644 shell/debug/res/drawable-hdpi/switch_bg_focused_holo_dark.9.png
 create mode 100644 shell/debug/res/drawable-hdpi/switch_bg_holo_dark.9.png
 create mode 100644 shell/debug/res/drawable-hdpi/switch_thumb_activated_holo_dark.9.png
 create mode 100644 shell/debug/res/drawable-hdpi/switch_thumb_disabled_holo_dark.9.png
 create mode 100644 shell/debug/res/drawable-hdpi/switch_thumb_holo_dark.9.png
 create mode 100644 shell/debug/res/drawable-hdpi/switch_thumb_pressed_holo_dark.9.png
 create mode 100644 shell/debug/res/drawable-ldpi/switch_bg_disabled_holo_dark.9.png
 create mode 100644 shell/debug/res/drawable-ldpi/switch_bg_focused_holo_dark.9.png
 create mode 100644 shell/debug/res/drawable-ldpi/switch_bg_holo_dark.9.png
 create mode 100644 shell/debug/res/drawable-ldpi/switch_thumb_activated_holo_dark.9.png
 create mode 100644 shell/debug/res/drawable-ldpi/switch_thumb_disabled_holo_dark.9.png
 create mode 100644 shell/debug/res/drawable-ldpi/switch_thumb_holo_dark.9.png
 create mode 100644 shell/debug/res/drawable-ldpi/switch_thumb_pressed_holo_dark.9.png
 create mode 100644 shell/debug/res/drawable-xhdpi/switch_bg_disabled_holo_dark.9.png
 create mode 100644 shell/debug/res/drawable-xhdpi/switch_bg_focused_holo_dark.9.png
 create mode 100644 shell/debug/res/drawable-xhdpi/switch_bg_holo_dark.9.png
 create mode 100644 shell/debug/res/drawable-xhdpi/switch_thumb_activated_holo_dark.9.png
 create mode 100644 shell/debug/res/drawable-xhdpi/switch_thumb_disabled_holo_dark.9.png
 create mode 100644 shell/debug/res/drawable-xhdpi/switch_thumb_holo_dark.9.png
 create mode 100644 shell/debug/res/drawable-xhdpi/switch_thumb_pressed_holo_dark.9.png
 create mode 100644 shell/debug/res/drawable/switch_inner_holo_dark.xml
 create mode 100644 shell/debug/res/drawable/switch_track_holo_dark.xml
 create mode 100644 shell/debug/res/values/attrs.xml
 create mode 100644 shell/debug/src/de/ankri/text/method/AllCapsTransformationMethod.java
 create mode 100644 shell/debug/src/de/ankri/text/method/TransformationMethodCompat.java
 create mode 100644 shell/debug/src/de/ankri/text/method/TransformationMethodCompat2.java
 create mode 100644 shell/debug/src/de/ankri/views/Switch.java
 create mode 100644 shell/debug/src/de/ankri/views/TwoStatePreference.java

diff --git a/shell/debug/res/drawable-hdpi/switch_bg_disabled_holo_dark.9.png b/shell/debug/res/drawable-hdpi/switch_bg_disabled_holo_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2196fd3fe32421dfc1837a139fafc9a23fc7b10
GIT binary patch
literal 249
zcmeAS@N?(olHy`uVBq!ia0vp^3P7yG!3HE*cI@g0QN>Q4Asj$Z!;#Vf<Z~8yL>4nJ
zaCd?*qxs3xYk`8ZJzX3_B3j?xILLcgL4f7J(IWN>C$CP-ial;RL8^fFb-$=;U!}^N
z+>^KdHab|JXP)5V{!8zBskWi#ZC>MQnaCIKF5jM%{P+&f0=9B-hRWSHnL^6z-L}n^
z{Knv%a?)PVfq{`l07$Tv_-zwxSikX2&Vi*+!G_a}YyUTH+V@;JxQ;R9O^uqyb|0nA
jDR##WEpEROF6pWBLrRA2f>Lc5(3uRLu6{1-oD!M<j@wpc

literal 0
HcmV?d00001

diff --git a/shell/debug/res/drawable-hdpi/switch_bg_focused_holo_dark.9.png b/shell/debug/res/drawable-hdpi/switch_bg_focused_holo_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e2ae0f36d4e6297e602fff5654869a42dd1a152
GIT binary patch
literal 269
zcmeAS@N?(olHy`uVBq!ia0vp^3P7yG!3HE*cI@g0QN>Q4Asj$Z!;#Vf<Z~8yL>4nJ
zaCd?*qxs3xYk`96JzX3_B3j?xIL+H^Ai#1V(nb7EA){Wi(+bVn7NZ!3ox#VSFm#&D
zcNR(hZKSMN+4{k*^K_P@kmSkVGg=rOVzzmobN#R8d-%@oUu+3$uUIokFdksOX2N@2
z>h9xB52X|8C6h1SpBOYN_T;*h&GAYN3``sfAmV~z@g`g5gtd&m$}lk#_L?^x_sT4m
zCd&!*y$$VcIew7&*yEK_%AA|0Z`|-@!mk`Rq4E>mD)wKBx7-Ihox#)9&t;ucLK6Ut
C1YZaM

literal 0
HcmV?d00001

diff --git a/shell/debug/res/drawable-hdpi/switch_bg_holo_dark.9.png b/shell/debug/res/drawable-hdpi/switch_bg_holo_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..933d99b6796c78e7c8e35c6f908fded4ca3f4c17
GIT binary patch
literal 182
zcmeAS@N?(olHy`uVBq!ia0vp^3P7yG!3HE*cI@g0Qk(@Ik;M!Q+?^oIXnykaTA*Nt
zr;B4qMC;pY8+jWHcw7P}Pqh&-Hk^`fW!2Kabh7ZypVvYscZJW3)bo<nF7<nsQeC&>
zcVMK1;P1C910%nw15JQ{!;?;zu{|(79mX8R3>C^?pYW~b?ZH<Qt4h5#2|J$Tb6j8J
Q-2;;JboFyt=akR{082<YkN^Mx

literal 0
HcmV?d00001

diff --git a/shell/debug/res/drawable-hdpi/switch_thumb_activated_holo_dark.9.png b/shell/debug/res/drawable-hdpi/switch_thumb_activated_holo_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c5147efc96653173a7a2c46864144a5486c678a
GIT binary patch
literal 549
zcmeAS@N?(olHy`uVBq!ia0vp^0YI$7!3HEheY6(`QY^(zo*^7SP{WbZ0pxQQctjR6
zFmQK*Fr)d&(`y+R7>|3pIEG|2zP-KMi#br>*vI!do7|eWv%0zluTZ%0Q)Jt+4V-pu
z`46ijR<E7gJJnT6diDY#6%V~P$5g5<({-8@ntC6v;XJqAXX4F2H|O{o8oIC~^QiIE
ze*WbWt8uY>`pPM@lzzGXv()nPUlDh$yPKQ)blpY+ZQIwIO*St!=&G82wb`er@8AzU
zk;+}Ub7Ox@oqPB2&!Cqo%wd|#m#>h#FS-7&g<Za#*}D0D{Xq)@H<c$?y9%^>o~_EO
zpJ4gCsOnAiu>~<-!fevB^ObioUzjvYRjNRuwRrJTiw6GL?;X86)^7HA+^}fgi;IfY
zY-yc}&;LC+uFu#|%oeF-b$@cr=l>4OMwt$3yeF10&NNY&%$9Pg!AEL>C-H)23pO_t
zABbObNT@g6THDI4Y^!pPI>&86hu0sxTlSP~>})VG<FFPy<fmlmWtQ-FS+~wkrwwI2
zGj}o^JH1@N(#hz}qRYDu{ml(8n)0GffuZ@-JsY!a=7AqhHx=(wx>3?F-A(vBf9;9f
zhm%SU@T;{;#tS~VKE2d7YURr`mjACzGoK$`U+<xG$hs|fZbeB%hc+;t89ZJ6T-G@y
GGywpXV&x?O

literal 0
HcmV?d00001

diff --git a/shell/debug/res/drawable-hdpi/switch_thumb_disabled_holo_dark.9.png b/shell/debug/res/drawable-hdpi/switch_thumb_disabled_holo_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..a257e26ddb5c97809bc7294030981211e6498fe7
GIT binary patch
literal 535
zcmeAS@N?(olHy`uVBq!ia0vp^0YI$7!3HEheY6(`QY^(zo*^7SP{WbZ0pxQQctjR6
zFmQK*Fr)d&(`y+R7<YQQIEG|2zP)Yee<(oUz{lO!+h!?oU%9zdc=E;dM-R9wKJ2zM
zElemh+Bjj$QeK<*_cA@4h8GWhmg@K}ExF^<`NgRg6J|0BK0NcmeEs~Ztw#0bGmp*S
zPKtkW|8Ye1p{%V%lTWJjK8~opwo<?;W7e{0z3EFV*&jY;S!HuqtlM?U^Pe`pm#rCg
zT$=H*+4*{D|Ln8NBGzBudx__+a7V}Wd%u5Q%=q$Xj&|jO=XOd;f~og@voln%HF#xD
z%R2D4ZhpmkVI{4_8n^g=R!{CYP+fo9#CMV9@yvad_rE*1SX?=2ee{fvi^q~G?kl`M
z<RcsuxiwN4TXhypU=`Wa;3O7sf{81VXu*|iDoP1y3C|9O7tfTODY?a5IHWvz)v8yo
zcky-1=sliXaE^D=BS)7T+j7IMm#$dlm2J$;Fojvn^`h1Dd7E@*t9wr3-x_n|Oo5Hu
z{ZpHCx)x=armuX*&cxui{Bnue?7K$_ZC=zRa6H^_H!r??cPx8V^o}*MAB6b~9&5Ax
w{hAuxZ}x1{!bkCY&%OQk;ko>znGa>t&u!9Pto~&IFlHG%UHx3vIVCg!001%PSpWb4

literal 0
HcmV?d00001

diff --git a/shell/debug/res/drawable-hdpi/switch_thumb_holo_dark.9.png b/shell/debug/res/drawable-hdpi/switch_thumb_holo_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd999d6de8993107502e939a4395f018188817af
GIT binary patch
literal 559
zcmeAS@N?(olHy`uVBq!ia0vp^0YI$7!3HEheY6(`QY^(zo*^7SP{WbZ0pxQQctjR6
zFmQK*Fr)d&(`y+R7%zIdIEG|2zP-J%@0No=!^4|j6Yu`&(5MlqY;(!XRBGM+NU%aT
z=(4M(qep|wMx_S~Wo5Z(K`!cZ{T_DBmhQfMHay7S+4RU5p0<ty63pRkdVA_Z#l1>i
z8chw#@2Hy?-<P*U-A8TmlKbz=FPr!-O}7<G?z#8-ae;-6_c_B4@A*W2mP+>@Kbc_g
z<I>x*{fr0LJ0;Is$n+n7fBEH?;~6HCx-_cU#as)w-^{TqwUP}Ey{hk$^K{3CYf{f+
zqON~^emBpYz2Sb)W*6pl*I)b1dv3lrZvB#J^0S;c&erYs4_iI;#l=L``!+2J&K%p;
zTE91RSt7Bx*Rad3rkkyX-$Y?DTgs&dAE^nR%to0GYP=_wFwP`i(1qE|m)X#*yJPM8
zXG)7Y4R0;Wba~$K?pVe9Lc96*ua&<2WV3#fisQ*j{&UYa-_6^ew=?G7$9vu9M0hP`
zpY?MMJR{b9H2nFUy<6YTk?7zE4ZYfa_~G*J|5Pl!OY8+0e5R$AM^39XIcBj?^1rJ~
zXymlnn{@mYwzqm;Vw9gDmS*Fsuz%m0*B8C^=DK}YA9uaXZqKiF6{R2C!n=20@0l}w
RDKN$vJYD@<);T3K0RVwo@BaV*

literal 0
HcmV?d00001

diff --git a/shell/debug/res/drawable-hdpi/switch_thumb_pressed_holo_dark.9.png b/shell/debug/res/drawable-hdpi/switch_thumb_pressed_holo_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea54380fc4ce96ded6bba67d4bb1723537c4cfdb
GIT binary patch
literal 566
zcmeAS@N?(olHy`uVBq!ia0vp^0YI$7!3HEheY6(`QY^(zo*^7SP{WbZ0pxQQctjR6
zFmQK*Fr)d&(`y+R7;kvGIEG|2zP)`uOE^&E_{aM*)e@z6Br+VMv_eW0_cbZx)imXG
zamOEYe<{7=6>~{A%fWXs9_6u|VITN!a7;Exopfh*b-mt_0Is_gHkU=tr_Xdf_vG}M
zxo0~kv~(n#{4neM^jA(NU+Z1AEbso&{O9|Pjq^VIda=b=g6CbCwf54lYfe8>I{Rvu
z+<V*GaS`VP|LkP;y_a|XzD()+eEXV<`qlczDRXuAy0RuP_RXri@&DV?FK>5;`!Bwz
zaof6JPS--8&w7U+ebh1BUK+;HP~>_|<>}qRBkm0LYtv@3&AB!?bY^?vMcts=?73%r
zEZY);`+fWS4t+W;x!53eXXkbiMuXJEo@K||G7tQ3WDoh&;3XGul3A<LL6v{S6UM1F
z3nmdS_%_YSE8*M$-!+FOC7es}T9)ino}5%FmSnn$@t$^->cwk%W}Px=LaXCT*PLs5
zs&TntGJm`1<39_wZ`&BW=3D!OMRS|ZoVmP=Yq320<j3Eq0#*EVV7OHO;fdeQuNlF+
z_U?N)XY~n*SvRly-=BS6{rQI5hnAKe;J$RIXEn#~uc`6<W$(&_5AUziz5VmU`Fa)4
aKWrj=>;Lb#_YWA^3=E#GelF{r5}E*Lwguh*

literal 0
HcmV?d00001

diff --git a/shell/debug/res/drawable-ldpi/switch_bg_disabled_holo_dark.9.png b/shell/debug/res/drawable-ldpi/switch_bg_disabled_holo_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..76ccb8e96aa0149ca381cc56d106a93f9fab1d2d
GIT binary patch
literal 206
zcmeAS@N?(olHy`uVBq!ia0vp^Vn8g%!3HEXp1%tNQY^(zo*^7SP{WbZ0pxQQctjR6
zFmQK*Fr)d&(`$i(1)eUBAs(H{KmPx>XP($l(RyUIWe0<@(eWEMZcG<Cd~TlYZpl+F
zyxhsj$=XG{uEkgC)rxqPSloE!Oe?M=FtJ@;(vzIzpxv<|)4=z@ii3;U_}QByFZ?((
w#f-5{FX0c!RAuEoGK;n>Nlr;<FyUf6Zzg{IZvFDBK)V?{UHx3vIVCg!0I=Ca)&Kwi

literal 0
HcmV?d00001

diff --git a/shell/debug/res/drawable-ldpi/switch_bg_focused_holo_dark.9.png b/shell/debug/res/drawable-ldpi/switch_bg_focused_holo_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..914e4337af81e1e9f19b3237fffab6e4ea283bf5
GIT binary patch
literal 216
zcmeAS@N?(olHy`uVBq!ia0vp^Vn8g%!3HEXp1%tNQY^(zo*^7SP{WbZ0pxQQctjR6
zFmQK*Fr)d&(`$i(Rh}-6As(G?uN~xVP~c&`5dT=L@1O+VAs@a+60(Oa_pwhs(RxMX
z(bE4e9+h`y@lP^1X6NC=pz!v1T5U?_I&Zi99~+;&GE%+HzG~KcWp(~5UI!T2|A^<r
zwZ|t)vhsTZd3QXnYRBz8Agx*OewM0=V$in<<(D}NrXCW$si0*1^2!<!peq<WUHx3v
IIVCg!0Q6BxEdT%j

literal 0
HcmV?d00001

diff --git a/shell/debug/res/drawable-ldpi/switch_bg_holo_dark.9.png b/shell/debug/res/drawable-ldpi/switch_bg_holo_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5582b553cc9febf7388d7bfd5e604b42ec9619d
GIT binary patch
literal 163
zcmeAS@N?(olHy`uVBq!ia0vp^Vn8g%!3HEXp1%tNQk(@Ik;M!Q+?^oIXnykaTA*O4
zr;B5VM`v<^g4`eVsE757rt&Er=s06&W;V~WGco=AJl}Ss|Hgqy0(J&jA66V(%*H?E
zpo!+=84?$`l(M9JgkhrE4RH*CQI`yj3>>6d8TxnfX$rO5F9TY@;OXk;vd$@?2>?Z)
BG9CZ`

literal 0
HcmV?d00001

diff --git a/shell/debug/res/drawable-ldpi/switch_thumb_activated_holo_dark.9.png b/shell/debug/res/drawable-ldpi/switch_thumb_activated_holo_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d7c236abb742d7a9d7cb1e72d17bcf30890c82e
GIT binary patch
literal 351
zcmeAS@N?(olHy`uVBq!ia0vp^W<V^*!3HGLcfD-`QY^(zo*^7SP{WbZ0pxQQctjR6
zFmQK*Fr)d&(`y+R7#TfX977^n-_9`fJM19fdf%dNDa%n_QS}8&AB$uL9?9LoBjmfT
zam5OUM=UERI0<b!DP?2g;P~>U%NkSvsNC;==a=2#S#?VAg8lOi^45KmC(p6lH+$N(
zmeaeBfBuzHb62Uf%Z+tcRPN!ohp!&(Rz0qzcK-BVpZld!_Lu)`yz1aGYsCTHwoIe$
zwTIWWZ8ClKM<_b<P#zNp+eW3(h5y^SpJGRq&ksJ+HPC1+nz4ZI!^Hz>l4}gZ44=NN
zJNNQtN22M*X^aaxv*W~zdv0%@zqd)kh--n;-H7cDfA;OZbbM;kdBITEC7)H~ex0-y
d4G!JMu=K3o%<rm&|9~OH;OXk;vd$@?2>_**ngRd-

literal 0
HcmV?d00001

diff --git a/shell/debug/res/drawable-ldpi/switch_thumb_disabled_holo_dark.9.png b/shell/debug/res/drawable-ldpi/switch_thumb_disabled_holo_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..82f05d623bdadf0a54fa4dbe9bc7b4c4655d3b77
GIT binary patch
literal 350
zcmeAS@N?(olHy`uVBq!ia0vp^W<V^*!3HGLcfD-`QY^(zo*^7SP{WbZ0pxQQctjR6
zFmQK*Fr)d&(`y+R7#TcW977^n-_9`1I$|K;x<4g-;z7M22`4_m4_9jh=Bsb#U~yiz
z;X&BBhDUQfC+BYak}>_n8RmuWUfY{ob#VE>@Z{N@?;DR>NZz!3wBK{B?~G+Hm*(C!
zfB!eQ&+W_~;p9Iu$3Lz)d9lk<Ny>?1_4m5KG)9IQJCzqP9<Ua<yhO}fbMB0vF`-wt
z8*wunIOCyd%Ulr9@lz)CpR!t*6jt<Vu6xf%A*UC!mYuxF?s8@A>#B>-GLELqd%k|(
z`}SSy;<u(UB;4MX8##?%V|)7by-mR>6%6W6q_f#3{Cl@orf_LR!JLi*JMT`ec&~py
d)W_umx9^z<ePN%xIlus7@O1TaS?83{1OWSsj)DLH

literal 0
HcmV?d00001

diff --git a/shell/debug/res/drawable-ldpi/switch_thumb_holo_dark.9.png b/shell/debug/res/drawable-ldpi/switch_thumb_holo_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..9bc7a68e9e86572b915ebcee6003656ac1c122e5
GIT binary patch
literal 362
zcmV-w0hRuVP)<h;3K|Lk000e1NJLTq001@s0015c1^@s6XS(f%00004b3#c}2nYxW
zd<bNS00009a7bBm000Y#000Y#0XNCZtpET43`s;mR9J=Wn6XZUKoCXmzC0!>A)zw(
z{y{&%j<2S);R~>%+6W~965~W23$?L)cX@Hio`ld{?#Tej4$KS}!2Vp@KI}41iQw#U
zZgyl7nx?rc%kmMxb$~(u@H$P?Q(f0DOb9FH`o4e2^ZZs--^nZhfQS_9y50jAK)g+~
z*f0!IRn?nwj*R+7RX@gY6aWr{*nusw#jiC)CN1_~Nn){)#9||f#YPf~jU*NuNh~&!
zSZstikA*p52F|2+9^U(7mSs0ZQ7D@Q0L!w7_nz*>23Xs+UDtId5xHW^0D!9MJkQS{
zw`ae51!nXI0D^Ge>n8yHxu44(SBg8wnHh-H+14XJtC*SL3vJI`upl<Z&Hw-a07*qo
IM6N<$g32hA;s5{u

literal 0
HcmV?d00001

diff --git a/shell/debug/res/drawable-ldpi/switch_thumb_pressed_holo_dark.9.png b/shell/debug/res/drawable-ldpi/switch_thumb_pressed_holo_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..670dc2e99a1b720f31120d3285c14292424a2396
GIT binary patch
literal 362
zcmeAS@N?(olHy`uVBq!ia0vp^W<V^*!3HGLcfD-`QY^(zo*^7SP{WbZ0pxQQctjR6
zFmQK*Fr)d&(`y+R7<oKh977^n-_9`fJM19f`adT}-Lc3^YlWpdpF{tIq8W2oJB{2O
zVj7q)TxjW13tE$Lc->=vW)TsQdA?72pLwo+d+dK^8aKbkBbE>6E#DpYdz_;3T;}&N
zr|86wTlTHgSNkrTGEHeB^Y-5R_I791$D5XJN&2*{yIja^`@~GEc&-*hp#wr)nL*ue
zYi9J`*%5s0=Tg>+5A#hK8lBF(T+H*iQ%yixO>LSqCQ8>{cCT{F*<;>;T_UMnHVM)f
z&7{|_T`c<e+tbR>*f`%<)0JBj85VH=R;$^we!(Bp|2MTe7PT=4DBg`IXE^lz?)1cW
q+CB9GlLTJcb{@~GT%Vxwk@YxF(9ClE)5^fWV(@hJb6Mw<&;$V7EsnAP

literal 0
HcmV?d00001

diff --git a/shell/debug/res/drawable-xhdpi/switch_bg_disabled_holo_dark.9.png b/shell/debug/res/drawable-xhdpi/switch_bg_disabled_holo_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..b23070c173199150e2edfa6b38de98d53f2b035a
GIT binary patch
literal 255
zcmeAS@N?(olHy`uVBq!ia0vp^T0m^Y!3HFciJm?Hq*#ibJVQ8upoSx*1IXtr@Q5sC
zVBqcqVMg<lr`G}n7kaulhGaCpz3IqzNI}5iVq=B!xrdpy?CDb5L$$d-Pn`5;`x4Hd
zt#<`xN*dHT?+ZLMb@S0{xBlK&bl>~^`0b!;s;c%odhO=@xf!x}_MK-gyh|m$jHje&
zoDG<@(8M{j?Gg`AV6|c53RCA^edmtVH($Nlo`5O~Ql9%mY}c=;KQm?vPhGbzC2h(l
j!>f_D{Z*W&&Qvg2+?90DTM&8%=vW3%S3j3^P6<r_F-&7u

literal 0
HcmV?d00001

diff --git a/shell/debug/res/drawable-xhdpi/switch_bg_focused_holo_dark.9.png b/shell/debug/res/drawable-xhdpi/switch_bg_focused_holo_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..e85103da2b8ec37bb0b75c4830ba9799c8071124
GIT binary patch
literal 285
zcmeAS@N?(olHy`uVBq!ia0vp^T0m^Y!3HFciJm?Hq*#ibJVQ8upoSx*1IXtr@Q5sC
zVBqcqVMg<lr`G}n_j|fHhGaCpy|t0I*+8K6;pVBj5{HuwIE+&#^gJ{)I_@o~IPr*U
zm;B7h_pV=D5TCxvSWz?K5BE|HLBY2l_gvOj|5|$U)tip`yM6q%vD+dQm5)z8XL&I;
zJNK3O?dtz_kxOT;aL(jgYB}Xuz$`RI*yEO^*Cex!R0o!ouI#g8ZNDVrRjhG#p$Q5@
z`rdW^cc;^}E!C@@?k~OMv&Ew;sBW9p=I?>>j*}j-9^0h2_}n}fL7-O{JYD@<);T3K
F0RZIRZ}b2F

literal 0
HcmV?d00001

diff --git a/shell/debug/res/drawable-xhdpi/switch_bg_holo_dark.9.png b/shell/debug/res/drawable-xhdpi/switch_bg_holo_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..732481e5997ed3c2125050ea4b25a8aa1baf172b
GIT binary patch
literal 229
zcmeAS@N?(olHy`uVBq!ia0vp^T0m^Y!3HFciJm?Hq*#ibJVQ8upoSx*1IXtr@Q5sC
zVBqcqVMg<lr`G}n+dW+zLoyoQ-q^|8U?9MH@u==jjjTl)*S9QbC}?UsoD{dC(R9*g
z`Gekn4j!35rQq_-jn{VB$ZonCHJg9A&iW}a2^wbuW-T;v&TPBHvsBW{cuE>rV2hA>
zPgJ?aMM=edX)D&tH({zUabCLr<yp)8_kp|Do#_$1Fo7>}&53P=KqoPHy85}Sb4q9e
E03lmeG5`Po

literal 0
HcmV?d00001

diff --git a/shell/debug/res/drawable-xhdpi/switch_thumb_activated_holo_dark.9.png b/shell/debug/res/drawable-xhdpi/switch_thumb_activated_holo_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca48bd866c2de51b9266bb8ed99a48f0a7257713
GIT binary patch
literal 653
zcmeAS@N?(olHy`uVBq!ia0vp^SwL*X!3HEF)}KiLQY^(zo*^7SP{WbZ0pxQQctjR6
zFmQK*Fr)d&(`y+RnDjke978JRyuGu(OE^&E_{aNmXXco-_=+Vvh;ScGl6KUVKX53C
z)qDPdOVc-gW7T0jSSHB5H86rDG1c01gLTp**~e%87V89ca_^q{T<%ZpEtB+5sn5=d
ze76#8Eap3QQgZ+7eGU^h>-BeZc!-Cu`s2CKmT|8CQriQ6)AQSJi>q1xjVl%8Tl&qW
zUf{^J_Q&$~U;FFJ-ODs_FO0DN6|&EGoo(gL(x0cUx;NLocNFkRnxr)S`3B|yF}+Z}
zudBYE-(UOp)0Yn)_qJZLSXAXMdpv7-_Mg0rM->l~#e?JG%TgcSSrOi+ed3+bwDpX8
zF3)l`4%wJf=NHawKW!0@;d-}h&n4ZHV!9p|T=HQQVVHDGV^{W+{M7=Bn@>OM{61ZS
z>Bx%*(O16)|6Hqo+iv-Vxl`9acQcqG$dk(AEO{`1>dajWo5WlAJhXmKKd-K;P|^M%
z^n2T@ylv~!i*s`3C1h8({4-d1;tiWWXU1%%(?6NM=B%^qO4B&_Z#DCgJpRQeV{`b9
zYpmYG=g{N$VfD=9!1oUy&t}$mw<FAUC#wU$d0zaXud}ybkoPIJNn(HdilhCv{D+@^
zc^a<Ia<LZKuy3_F!<19SbKDqQ7-Sn3*tD-aEcY)w$Hm3vW|0^BmFRex|1ag$lz#Aj
Yu-f9b_?h=YV0vQkboFyt=akR{00j*acmMzZ

literal 0
HcmV?d00001

diff --git a/shell/debug/res/drawable-xhdpi/switch_thumb_disabled_holo_dark.9.png b/shell/debug/res/drawable-xhdpi/switch_thumb_disabled_holo_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3d80f0eb33fccb012fcf57cd12391fd74731a20
GIT binary patch
literal 633
zcmeAS@N?(olHy`uVBq!ia0vp^SwL*X!3HEF)}KiLQY^(zo*^7SP{WbZ0pxQQctjR6
zFmQK*Fr)d&(`y+Rn4~>j978JRyuEX<>sElsv5)W7E=G8<O=)s=j1@_{_>K2h)FbB?
z*<X1#y;x?zdoyH(;FhZ?d3k=~!MkP|ZGN?rec%0St?ED3kFgZZ?Koh`{`kqv^S=2D
zP882}cX3(L9lq*^=OSCiy*|rq50vee^<RGZ_Qi}Zw=Bi4HYzJMfB$#=W5u6+H*@4n
z(hDp8ybRuXK4Sg#_0vv2U2b#!zV-7W!OmB8$1T;BE|tc9U%Kw~`Q3NltupCaF)uK3
z+TO4C>U}PMiJq3awS#BYXB)+rzv~|E{Xb#ZOWTI^QOy}`UbnXG{dlimeX=L-gY+f-
z9$D}I#@^m$&LG5~#Xk9!>B9HFOC;D_D%Ad}Dmim7-mAV^yY$ynr9;mn^hK`j*ZF1M
zX4JH>CqYA5;uHs!nNGiD<2V%+S_IxQ3OjlHJG0^!-|APNSbZ;VaSdz{IJ8Kk%j)!|
z6>+=X{kF55f4=+lQz5=~=hc?oX&RcRi{8&!owoVr?#nMrrmGarjW}%ZplWa1vdmSR
zbiN0~n0u8z6=PWZv*usg)~L0gZ1e^0n-;&=^)4nfbnE^1^$Z`piaW|Q9(-IQ$Luln
zc|{ik2ZJ2Lms7<Bk`~N2IyyQQJ)I)9VtZZTpY_&0E+3@Zicde!yS&03n06REUHx3v
IIVCg!0EH4E!2kdN

literal 0
HcmV?d00001

diff --git a/shell/debug/res/drawable-xhdpi/switch_thumb_holo_dark.9.png b/shell/debug/res/drawable-xhdpi/switch_thumb_holo_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..df236df8292842d81dfef4c068b7d17176de4519
GIT binary patch
literal 687
zcmeAS@N?(olHy`uVBq!ia0vp^SwL*X!3HEF)}KiLQY^(zo*^7SP{WbZ0pxQQctjR6
zFmQK*Fr)d&(`y+Rm;yar978JRyuGtA>vn+1v5&<n+Fh~QQ}{A%N>1EZSn-Bg<dae5
zY@5D?`WLpg<ux8N5<95p`f01m>F@J+IF~m2T77+S;Cu95nV0AHPGXA}6HH1o@{9X<
z_X}&+p0Y}yrMo^Xd1c?ZMZKZk_<~%5+3dOgYLodhXYEUU7EwKKe`iPj?Qh?+wnp8#
zbH`-XW&_*&TCMw%<>lqiFTeb9y1?R(j#7TyKJj0hM2(Gwjd$-_xBu+(&+E5u-@f&d
z&Z1q5Zf&dGe=}!Y=ZZUd+xzeRR<QlKD><$2v4vFs@#iijvDd$<3jVz^%iTC+ON7p`
z#TPY}WbXQUkNs$*->vuG+m~fNYHx4v=}=M%ni>2x^^oQCH)Xp|RNwCoE$R7gcct{~
zIm@ee-AzL{8l5<<On>`MLhz^Ya<x74q#Fa=6s8Drq_Q|kQkA(-%FD&WWkyxquj{9K
zR)sj5`U+b<pS14vmHZ=`vDaPC?Oc*6b+vlwFZM@Ii*B|G7(I`vDlOgWJL$;xr*9kt
z7p{B#XpzRT%6aoeT`y*yTP*4I?*04jO*-8+=j~G?#dz78<65m`_zFWq4_bb&-5V#q
zq#~m8)k$5KDJhX<m4$^L4Z9YVpSiPoy0jptVoQ8#<i8cGUQO)S5;irXU8ySWYPySv
z_W8mdfr;viYz1YfJb!WargMRm6eEK}{>Dp;U$4pc{r}q5$zjVl_21WHKTV@Q10$co
M)78&qol`;+0J3Z^B>(^b

literal 0
HcmV?d00001

diff --git a/shell/debug/res/drawable-xhdpi/switch_thumb_pressed_holo_dark.9.png b/shell/debug/res/drawable-xhdpi/switch_thumb_pressed_holo_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..4acb32b1933965edafd1566c95536d9bee6a52ec
GIT binary patch
literal 660
zcmeAS@N?(olHy`uVBq!ia0vp^SwL*X!3HEF)}KiLQY^(zo*^7SP{WbZ0pxQQctjR6
zFmQK*Fr)d&(`y+Rn9Mv~978JRyuD-JE$k?9{Nw#MdFOT?+5Pk#4@Z{#20@V;MkTTE
z8^74r)Yz6?`&M?yR5M3O!_4WyD;cLf_MJDM<dvn#bt`Zvl}|ly^W*oH%z1b9H#>Jp
zsw)+oJ7}@<QTb(ljiRfM1qB6PKJuGtuen8i!RwV<*egmc-o1VImftG0^t9!aTc7{<
zv25gh`1|I|lRv&*c3f=PefZbq<)7>y-@JYC+uYsX<MQ%K=CLQ(b8U)xxYT)7!{qL5
zwdFRJb)WwoUA*&>#-d$|(%v0A5PQn;%fh^-9~zZ!r!Q@O9lB1>l`ri@4a0}PY_YQe
zN0WBGIo=(y*u^7KHHy1oi>FZ1nsDFC>;ViOQkz%QWgUqRQ*@i2yd-`SgQA=Izo63p
zA@_uh^uDm)jof@|&&&4`r#RY-nilpXXed*gc{Si<^~48_ON#1#Rs}V&yr1-aRl0NN
zdi@WVPp-M~MsLIB?T@!rofNIqE%4;rl+{&MXZ8K^NuOe%r;6;XY*t0v=am2UKlQHc
z?J2F*+ybg>ou}nDf6K9&Q!gjy`0>crS7&t@tjyor@4G8)QxlL^`r9Ec{0&1#;nq23
zkNxAt;@$5vZ1F1YDAP#TyUKh+-;}Fehko64VUTkOn0NR}D*u0NGbN=(IhISgU#-pW
g`~Ri2lcSDFQUAclE#{K*fys)&)78&qol`;+0FlKehyVZp

literal 0
HcmV?d00001

diff --git a/shell/debug/res/drawable/switch_inner_holo_dark.xml b/shell/debug/res/drawable/switch_inner_holo_dark.xml
new file mode 100644
index 000000000..67584bc25
--- /dev/null
+++ b/shell/debug/res/drawable/switch_inner_holo_dark.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:drawable="@drawable/switch_thumb_disabled_holo_dark" />
+    <item android:state_pressed="true"  android:drawable="@drawable/switch_thumb_pressed_holo_dark" />
+    <item android:state_checked="true"  android:drawable="@drawable/switch_thumb_activated_holo_dark" />
+    <item                               android:drawable="@drawable/switch_thumb_holo_dark" />
+</selector>
diff --git a/shell/debug/res/drawable/switch_track_holo_dark.xml b/shell/debug/res/drawable/switch_track_holo_dark.xml
new file mode 100644
index 000000000..5f796c177
--- /dev/null
+++ b/shell/debug/res/drawable/switch_track_holo_dark.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true"  android:drawable="@drawable/switch_bg_focused_holo_dark" />
+    <item                               android:drawable="@drawable/switch_bg_holo_dark" />
+</selector>
diff --git a/shell/debug/res/layout/dialog_message.xml b/shell/debug/res/layout/dialog_message.xml
index db9d185ad..20dbd621d 100644
--- a/shell/debug/res/layout/dialog_message.xml
+++ b/shell/debug/res/layout/dialog_message.xml
@@ -5,6 +5,41 @@
     android:fitsSystemWindows="true"
     android:orientation="vertical" >
 
+    <TableLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="6dp"
+            android:stretchColumns="*" >
+
+            <TableRow
+                android:layout_marginTop="10dp"
+                android:gravity="center_vertical" >
+
+                <TextView
+                    android:id="@+id/notify_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5"
+                    android:ems="10"
+                    android:gravity="center_vertical|left"
+                    android:text="@string/select_notify" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="right"
+                    android:orientation="vertical" >
+
+                    <de.ankri.views.Switch
+                        android:id="@+id/notify_option"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:focusable="true" />
+                </LinearLayout>
+            </TableRow>
+            </TableLayout>
+
     <EditText
         android:id="@+id/txt_message"
         android:layout_width="fill_parent"
diff --git a/shell/debug/res/values/attrs.xml b/shell/debug/res/values/attrs.xml
new file mode 100644
index 000000000..4bc48032d
--- /dev/null
+++ b/shell/debug/res/values/attrs.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<attr name="switchStyle" format="reference" />
+    <declare-styleable name="Switch">
+        <attr name="thumb" format="reference"/>
+        <attr name="track" format="reference" />
+        <attr name="textOn" format="string"/>
+        <attr name="textOff" format="string"/>
+        <attr name="thumbTextPadding" format="dimension" />
+        <attr name="switchTextAppearance" format="reference" />
+        <attr name="switchMinWidth" format="dimension" />
+        <attr name="switchPadding" format="dimension" />
+        <attr name="switchPreferenceStyle" format="reference" />
+	</declare-styleable>
+	
+    <attr name="textAppearance" format="reference" />
+  <declare-styleable name="TextAppearanceSwitch" >
+      	<attr name="textColor" format="color" /> 
+        <attr name="textSize" format="dimension"/>
+        <attr name="textStyle" format="reference"/>
+        <attr name="typeface" format="reference"/>
+        <attr name="fontFamily" format="reference"/>
+        <attr name="textColorHighlight" format="color"/>
+        <attr name="textColorHint" format="color" />
+        <attr name="textColorLink" format="color" />
+        <attr name="textAllCaps" format="boolean" />
+    </declare-styleable>
+    
+  <declare-styleable name="SlidingMenu">
+        <attr name="mode">
+            <enum name="left" value="0" />
+            <enum name="right" value="1" />
+        </attr>
+        <attr name="viewAbove" format="reference" />
+        <attr name="viewBehind" format="reference" />
+        <attr name="behindOffset" format="dimension" />
+        <attr name="behindWidth" format="dimension" />
+        <attr name="behindScrollScale" format="float" />
+        <attr name="touchModeAbove">
+            <enum name="margin" value="0" />
+            <enum name="fullscreen" value="1" />
+        </attr>
+        <attr name="touchModeBehind">
+            <enum name="margin" value="0" />
+            <enum name="fullscreen" value="1" />
+        </attr>
+        <attr name="shadowDrawable" format="reference" />
+        <attr name="shadowWidth" format="dimension" />
+        <attr name="fadeEnabled" format="boolean" />
+        <attr name="fadeDegree" format="float" />
+        <attr name="selectorEnabled" format="boolean" />
+        <attr name="selectorDrawable" format="reference" />
+    </declare-styleable>
+  
+</resources>
\ No newline at end of file
diff --git a/shell/debug/res/values/strings.xml b/shell/debug/res/values/strings.xml
index 4f3c86c9c..f322c02e2 100644
--- a/shell/debug/res/values/strings.xml
+++ b/shell/debug/res/values/strings.xml
@@ -1,4 +1,10 @@
 <resources>
 
     <string name="app_name">reicast debug</string>
+
+    <string name="select_notify">Message Notifications</string>
+
+    <string name="textOn">ON</string>
+    <string name="textOff">OFF</string>
+
 </resources>
diff --git a/shell/debug/res/values/themes.xml b/shell/debug/res/values/themes.xml
index 1898eb1dc..508055d15 100644
--- a/shell/debug/res/values/themes.xml
+++ b/shell/debug/res/values/themes.xml
@@ -7,6 +7,27 @@
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item>
+        <item name="switchStyle">@style/switch_dark</item>
+        <item name="textAppearance">@style/TextAppearance</item>
+    </style>
+
+    <style name="switch_dark">
+        <item name="track">@drawable/switch_track_holo_dark</item>
+        <item name="thumb">@drawable/switch_inner_holo_dark</item>
+        <item name="textOn">@string/textOn</item>
+        <item name="textOff">@string/textOff</item>
+        <item name="thumbTextPadding">12dip</item>
+        <item name="switchMinWidth">96dip</item>
+        <item name="switchPadding">16dip</item>
+        <item name="switchTextAppearance">@style/TextAppearance</item>
+    </style>
+    
+    <style name="TextAppearance">
+        <item name="textColor">?android:attr/textColorPrimary</item>
+        <item name="textColorHighlight">?android:attr/textColorHighlight</item>
+        <item name="textColorHint">?android:attr/textColorHint</item>
+        <item name="textColorLink">?android:attr/textColorLink</item>
+        <item name="textSize">16sp</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/shell/debug/src/com/reicast/emulator/debug/Debug.java b/shell/debug/src/com/reicast/emulator/debug/Debug.java
index bc2fae494..f96445e37 100644
--- a/shell/debug/src/com/reicast/emulator/debug/Debug.java
+++ b/shell/debug/src/com/reicast/emulator/debug/Debug.java
@@ -57,8 +57,10 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
+import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.BaseAdapter;
 import android.widget.Button;
+import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -67,6 +69,8 @@ import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GooglePlayServicesUtil;
 import com.google.android.gms.gcm.GoogleCloudMessaging;
 
+import de.ankri.views.Switch;
+
 public class Debug extends Activity {
 
 	public static final String APP_TAG = "reicast-debug";
@@ -117,6 +121,18 @@ public class Debug extends Activity {
 		} else {
 			GooglePlayServicesUtil.getErrorDialog(resultCode, this, 1).show();
 		}
+
+		OnCheckedChangeListener notify_options = new OnCheckedChangeListener() {
+
+			public void onCheckedChanged(CompoundButton buttonView,
+					boolean isChecked) {
+				mPrefs.edit().putBoolean("enable_messaging", isChecked).commit();
+			}
+		};
+		Switch notify_opt = (Switch) findViewById(R.id.notify_option);
+		notify_opt.setChecked(mPrefs.getBoolean("enable_messaging", true));
+		notify_opt.setOnCheckedChangeListener(notify_options);
+
 		RequestArchive mRequestArchive = new RequestArchive() {
 			@Override
 			protected void onPostExecute(List<String[]> jsonArray) {
@@ -409,7 +425,7 @@ public class Debug extends Activity {
 				boolean hasIdentitiy = false;
 				String identity = mPrefs.getString(PREF_IDENTITY, "?");
 				if (!identity.equals("?")) {
-					mPairs.add(new BasicNameValuePair("sender", "reicast tag #"
+					mPairs.add(new BasicNameValuePair("sender", "reicast tester "
 							+ identity));
 					hasIdentitiy = true;
 				} else {
@@ -519,7 +535,7 @@ public class Debug extends Activity {
 				if (!identity.equals("Err")) {
 					mPrefs.edit().putString(PREF_IDENTITY, identity).commit();
 				}
-				Log.d(APP_TAG, "reicast tag #" + identity);
+				Log.d(APP_TAG, "reicast tester " + identity);
 			}
 		}
 
diff --git a/shell/debug/src/com/reicast/emulator/debug/GcmBroadcastReceiver.java b/shell/debug/src/com/reicast/emulator/debug/GcmBroadcastReceiver.java
index c670eda48..e54aa14e0 100644
--- a/shell/debug/src/com/reicast/emulator/debug/GcmBroadcastReceiver.java
+++ b/shell/debug/src/com/reicast/emulator/debug/GcmBroadcastReceiver.java
@@ -37,7 +37,7 @@ public class GcmBroadcastReceiver extends BroadcastReceiver {
 				Log.d(TAG, "Sender: " + sender);
 				String message = extras.getString("message");
 				if (!message.equals("")) {
-					if (sender.contains("reicast tag #")) {
+					if (sender.contains("reicast tester ")) {
 						sendNotification(sender, message);
 					}
 				}
@@ -50,7 +50,7 @@ public class GcmBroadcastReceiver extends BroadcastReceiver {
 	private void sendNotification(String sender, String message) {
 		SharedPreferences prefs = PreferenceManager
 				.getDefaultSharedPreferences(mContext);
-		final String number = sender.replace("reicast tag #", "");
+		final String number = sender.replace("reicast tester ", "");
 		long timestamp = System.currentTimeMillis();
 		int reference = (int) timestamp;
 		if (prefs.getBoolean("enable_messaging", true)) {
diff --git a/shell/debug/src/de/ankri/text/method/AllCapsTransformationMethod.java b/shell/debug/src/de/ankri/text/method/AllCapsTransformationMethod.java
new file mode 100644
index 000000000..1e6af8467
--- /dev/null
+++ b/shell/debug/src/de/ankri/text/method/AllCapsTransformationMethod.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package de.ankri.text.method;
+
+import java.util.Locale;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.util.Log;
+import android.view.View;
+
+/**
+ * Transforms source text into an ALL CAPS string, locale-aware.
+ * 
+ * @hide
+ */
+public class AllCapsTransformationMethod implements TransformationMethodCompat2
+{
+	private static final String TAG = "AllCapsTransformationMethod";
+
+	private boolean mEnabled;
+	private Locale mLocale;
+
+	public AllCapsTransformationMethod(Context context)
+	{
+		mLocale = context.getResources().getConfiguration().locale;
+	}
+
+	public CharSequence getTransformation(CharSequence source, View view)
+	{
+		if (mEnabled)
+		{
+			return source != null ? source.toString().toUpperCase(mLocale) : null;
+		}
+		Log.w(TAG, "Caller did not enable length changes; not transforming text");
+		return source;
+	}
+
+	public void onFocusChanged(View view, CharSequence sourceText, boolean focused, int direction, Rect previouslyFocusedRect)
+	{
+	}
+
+	public void setLengthChangesAllowed(boolean allowLengthChanges)
+	{
+		mEnabled = allowLengthChanges;
+	}
+
+}
diff --git a/shell/debug/src/de/ankri/text/method/TransformationMethodCompat.java b/shell/debug/src/de/ankri/text/method/TransformationMethodCompat.java
new file mode 100644
index 000000000..dca9b107a
--- /dev/null
+++ b/shell/debug/src/de/ankri/text/method/TransformationMethodCompat.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.ankri.text.method;
+
+import android.graphics.Rect;
+import android.view.View;
+
+/**
+ * TextView uses TransformationMethods to do things like replacing the characters of passwords with dots, or keeping the newline characters from causing line breaks in single-line text fields.
+ */
+public interface TransformationMethodCompat
+{
+	/**
+	 * Returns a CharSequence that is a transformation of the source text -- for example, replacing each character with a dot in a password field. Beware that the returned text must be exactly the
+	 * same length as the source text, and that if the source text is Editable, the returned text must mirror it dynamically instead of doing a one-time copy.
+	 */
+	public CharSequence getTransformation(CharSequence source, View view);
+
+	/**
+	 * This method is called when the TextView that uses this TransformationMethod gains or loses focus.
+	 */
+	public void onFocusChanged(View view, CharSequence sourceText, boolean focused, int direction, Rect previouslyFocusedRect);
+}
diff --git a/shell/debug/src/de/ankri/text/method/TransformationMethodCompat2.java b/shell/debug/src/de/ankri/text/method/TransformationMethodCompat2.java
new file mode 100644
index 000000000..13a0ff33a
--- /dev/null
+++ b/shell/debug/src/de/ankri/text/method/TransformationMethodCompat2.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package de.ankri.text.method;
+
+/**
+ * TransformationMethod2 extends the TransformationMethod interface
+ * and adds the ability to relax restrictions of TransformationMethod.
+ *
+ * @hide
+ */
+public interface TransformationMethodCompat2 extends TransformationMethodCompat {
+    /**
+     * Relax the contract of TransformationMethod to allow length changes,
+     * or revert to the length-restricted behavior.
+     *
+     * @param allowLengthChanges true to allow the transformation to change the length
+     *                           of the input string.
+     */
+    public void setLengthChangesAllowed(boolean allowLengthChanges);
+}
diff --git a/shell/debug/src/de/ankri/views/Switch.java b/shell/debug/src/de/ankri/views/Switch.java
new file mode 100644
index 000000000..d4470a743
--- /dev/null
+++ b/shell/debug/src/de/ankri/views/Switch.java
@@ -0,0 +1,890 @@
+package de.ankri.views;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.text.Layout;
+import android.text.StaticLayout;
+import android.text.TextPaint;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.util.FloatMath;
+import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.VelocityTracker;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.widget.CompoundButton;
+
+import com.reicast.emulator.debug.R;
+
+import de.ankri.text.method.AllCapsTransformationMethod;
+import de.ankri.text.method.TransformationMethodCompat2;
+
+/**
+ * A Switch is a two-state toggle switch widget that can select between two options. The user may drag the "thumb" back and forth to choose the selected option, or simply tap to toggle as if it were a
+ * checkbox. The {@link #setText(CharSequence) text} property controls the text displayed in the label for the switch, whereas the {@link #setTextOff(CharSequence) off} and
+ * {@link #setTextOn(CharSequence) on} text controls the text on the thumb. Similarly, the {@link #setTextAppearance(android.content.Context, int) textAppearance} and the related setTypeface() methods
+ * control the typeface and style of label text, whereas the {@link #setSwitchTextAppearance(android.content.Context, int) switchTextAppearance} and the related seSwitchTypeface() methods control that
+ * of the thumb. <br>
+ * 
+ * <p>
+ * See the <a href="http://developer.android.com/guide/topics/ui/controls/togglebutton.html">Toggle Buttons</a> guide.
+ * </p>
+ * 
+ * @attr ref android.R.styleable#Switch_textOn
+ * @attr ref android.R.styleable#Switch_textOff
+ * @attr ref android.R.styleable#Switch_switchMinWidth
+ * @attr ref android.R.styleable#Switch_switchPadding
+ * @attr ref android.R.styleable#Switch_switchTextAppearance
+ * @attr ref android.R.styleable#Switch_thumb
+ * @attr ref android.R.styleable#Switch_thumbTextPadding
+ * @attr ref android.R.styleable#Switch_track
+ */
+public class Switch extends CompoundButton
+{
+	private static final int TOUCH_MODE_IDLE = 0;
+	private static final int TOUCH_MODE_DOWN = 1;
+	private static final int TOUCH_MODE_DRAGGING = 2;
+
+	// Enum for the "typeface" XML parameter.
+	private static final int SANS = 1;
+	private static final int SERIF = 2;
+	private static final int MONOSPACE = 3;
+
+	private Drawable mThumbDrawable;
+	private Drawable mTrackDrawable;
+	private int mThumbTextPadding;
+	private int mSwitchMinWidth;
+	private int mSwitchPadding;
+	private CharSequence mTextOn;
+	private CharSequence mTextOff;
+
+	private int mTouchMode;
+	private int mTouchSlop;
+	private float mTouchX;
+	private float mTouchY;
+	@SuppressLint("Recycle")
+	private VelocityTracker mVelocityTracker = VelocityTracker.obtain();
+	private int mMinFlingVelocity;
+
+	private float mThumbPosition;
+	private int mSwitchWidth;
+	private int mSwitchHeight;
+	private int mThumbWidth; // Does not include padding
+
+	private int mSwitchLeft;
+	private int mSwitchTop;
+	private int mSwitchRight;
+	private int mSwitchBottom;
+
+	private TextPaint mTextPaint;
+	private ColorStateList mTextColors;
+	private Layout mOnLayout;
+	private Layout mOffLayout;
+
+	private TransformationMethodCompat2 mSwitchTransformationMethod;
+
+	private final Rect mTempRect = new Rect();
+
+	private static final int[] CHECKED_STATE_SET = { android.R.attr.state_checked };
+
+	/**
+	 * Construct a new Switch with default styling.
+	 * 
+	 * @param context
+	 *            The Context that will determine this widget's theming.
+	 */
+	public Switch(Context context)
+	{
+		this(context, null);
+	}
+
+	/**
+	 * Construct a new Switch with default styling, overriding specific style attributes as requested.
+	 * 
+	 * @param context
+	 *            The Context that will determine this widget's theming.
+	 * @param attrs
+	 *            Specification of attributes that should deviate from default styling.
+	 */
+	public Switch(Context context, AttributeSet attrs)
+	{
+		this(context, attrs, R.attr.switchStyle);
+	}
+
+	/**
+	 * Construct a new Switch with a default style determined by the given theme attribute, overriding specific style attributes as requested.
+	 * 
+	 * @param context
+	 *            The Context that will determine this widget's theming.
+	 * @param attrs
+	 *            Specification of attributes that should deviate from the default styling.
+	 * @param defStyle
+	 *            An attribute ID within the active theme containing a reference to the default style for this widget. e.g. android.R.attr.switchStyle.
+	 */
+	public Switch(Context context, AttributeSet attrs, int defStyle)
+	{
+		super(context, attrs, defStyle);
+
+		mTextPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
+		Resources res = getResources();
+		mTextPaint.density = res.getDisplayMetrics().density;
+
+		// TODO resolve error
+		// mTextPaint.setCompatibilityScaling(res.getCompatibilityInfo().applicationScale);
+
+		final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.Switch, defStyle, 0);
+
+		mThumbDrawable = a.getDrawable(R.styleable.Switch_thumb);
+		mTrackDrawable = a.getDrawable(R.styleable.Switch_track);
+		mTextOn = a.getText(R.styleable.Switch_textOn);
+		mTextOff = a.getText(R.styleable.Switch_textOff);
+		mThumbTextPadding = a.getDimensionPixelSize(R.styleable.Switch_thumbTextPadding, 0);
+		mSwitchMinWidth = a.getDimensionPixelSize(R.styleable.Switch_switchMinWidth, 0);
+		mSwitchPadding = a.getDimensionPixelSize(R.styleable.Switch_switchPadding, 0);
+
+		int appearance = a.getResourceId(R.styleable.Switch_switchTextAppearance, 0);
+		if (appearance != 0)
+		{
+			setSwitchTextAppearance(context, appearance);
+		}
+		a.recycle();
+
+		ViewConfiguration config = ViewConfiguration.get(context);
+		mTouchSlop = config.getScaledTouchSlop();
+		mMinFlingVelocity = config.getScaledMinimumFlingVelocity();
+
+		// Refresh display with current params
+		refreshDrawableState();
+		setChecked(isChecked());
+
+		// TODO I don't know why, but in order for the OnCheckedChangeListener to work this switch has to have an OnClickListener
+		this.setOnClickListener(new View.OnClickListener()
+		{
+
+			public void onClick(View v)
+			{
+				// do nothing
+			}
+		});
+	}
+
+	/**
+	 * Sets the switch text color, size, style, hint color, and highlight color from the specified TextAppearance resource.
+	 * 
+	 * @attr ref android.R.styleable#Switch_switchTextAppearance
+	 */
+	public void setSwitchTextAppearance(Context context, int resid)
+	{
+		TypedArray appearance = context.obtainStyledAttributes(resid, R.styleable.TextAppearanceSwitch);
+
+		ColorStateList colors;
+		int ts;
+
+		colors = appearance.getColorStateList(R.styleable.TextAppearanceSwitch_textColor);
+		if (colors != null)
+		{
+			mTextColors = colors;
+		}
+		else
+		{
+			// If no color set in TextAppearance, default to the view's textColor
+			mTextColors = getTextColors();
+		}
+
+		ts = appearance.getDimensionPixelSize(R.styleable.TextAppearanceSwitch_textSize, 0);
+		if (ts != 0)
+		{
+			if (ts != mTextPaint.getTextSize())
+			{
+				mTextPaint.setTextSize(ts);
+				requestLayout();
+			}
+		}
+
+		int typefaceIndex, styleIndex;
+
+		typefaceIndex = appearance.getInt(R.styleable.TextAppearanceSwitch_typeface, -1);
+		styleIndex = appearance.getInt(R.styleable.TextAppearanceSwitch_textStyle, -1);
+
+		setSwitchTypefaceByIndex(typefaceIndex, styleIndex);
+
+		boolean allCaps = appearance.getBoolean(R.styleable.TextAppearanceSwitch_textAllCaps, false);
+		if (allCaps)
+		{
+			mSwitchTransformationMethod = new AllCapsTransformationMethod(getContext());
+			mSwitchTransformationMethod.setLengthChangesAllowed(true);
+		}
+		else
+		{
+			mSwitchTransformationMethod = null;
+		}
+
+		appearance.recycle();
+	}
+
+	private void setSwitchTypefaceByIndex(int typefaceIndex, int styleIndex)
+	{
+		Typeface tf = null;
+		switch (typefaceIndex)
+		{
+			case SANS:
+				tf = Typeface.SANS_SERIF;
+				break;
+
+			case SERIF:
+				tf = Typeface.SERIF;
+				break;
+
+			case MONOSPACE:
+				tf = Typeface.MONOSPACE;
+				break;
+		}
+
+		setSwitchTypeface(tf, styleIndex);
+	}
+
+	public void setSwitchTypeface(Typeface tf, int style)
+	{
+		if (style > 0)
+		{
+			if (tf == null)
+			{
+				tf = Typeface.defaultFromStyle(style);
+			}
+			else
+			{
+				tf = Typeface.create(tf, style);
+			}
+
+			setSwitchTypeface(tf);
+			// now compute what (if any) algorithmic styling is needed
+			int typefaceStyle = tf != null ? tf.getStyle() : 0;
+			int need = style & ~typefaceStyle;
+			mTextPaint.setFakeBoldText((need & Typeface.BOLD) != 0);
+			mTextPaint.setTextSkewX((need & Typeface.ITALIC) != 0 ? -0.25f : 0);
+		}
+		else
+		{
+			mTextPaint.setFakeBoldText(false);
+			mTextPaint.setTextSkewX(0);
+			setSwitchTypeface(tf);
+		}
+	}
+
+	/**
+	 * Sets the typeface in which the text should be displayed on the switch. Note that not all Typeface families actually have bold and italic variants, so you may need to use
+	 * {@link #setSwitchTypeface(Typeface, int)} to get the appearance that you actually want.
+	 * 
+	 * @attr ref android.R.styleable#TextView_typeface
+	 * @attr ref android.R.styleable#TextView_textStyle
+	 */
+	public void setSwitchTypeface(Typeface tf)
+	{
+		if (mTextPaint.getTypeface() != tf)
+		{
+			mTextPaint.setTypeface(tf);
+
+			requestLayout();
+			invalidate();
+		}
+	}
+
+	/**
+	 * Set the amount of horizontal padding between the switch and the associated text.
+	 * 
+	 * @param pixels
+	 *            Amount of padding in pixels
+	 * 
+	 * @attr ref android.R.styleable#Switch_switchPadding
+	 */
+	public void setSwitchPadding(int pixels)
+	{
+		mSwitchPadding = pixels;
+		requestLayout();
+	}
+
+	/**
+	 * Get the amount of horizontal padding between the switch and the associated text.
+	 * 
+	 * @return Amount of padding in pixels
+	 * 
+	 * @attr ref android.R.styleable#Switch_switchPadding
+	 */
+	public int getSwitchPadding()
+	{
+		return mSwitchPadding;
+	}
+
+	/**
+	 * Set the minimum width of the switch in pixels. The switch's width will be the maximum of this value and its measured width as determined by the switch drawables and text used.
+	 * 
+	 * @param pixels
+	 *            Minimum width of the switch in pixels
+	 * 
+	 * @attr ref android.R.styleable#Switch_switchMinWidth
+	 */
+	public void setSwitchMinWidth(int pixels)
+	{
+		mSwitchMinWidth = pixels;
+		requestLayout();
+	}
+
+	/**
+	 * Get the minimum width of the switch in pixels. The switch's width will be the maximum of this value and its measured width as determined by the switch drawables and text used.
+	 * 
+	 * @return Minimum width of the switch in pixels
+	 * 
+	 * @attr ref android.R.styleable#Switch_switchMinWidth
+	 */
+	public int getSwitchMinWidth()
+	{
+		return mSwitchMinWidth;
+	}
+
+	/**
+	 * Set the horizontal padding around the text drawn on the switch itself.
+	 * 
+	 * @param pixels
+	 *            Horizontal padding for switch thumb text in pixels
+	 * 
+	 * @attr ref android.R.styleable#Switch_thumbTextPadding
+	 */
+	public void setThumbTextPadding(int pixels)
+	{
+		mThumbTextPadding = pixels;
+		requestLayout();
+	}
+
+	/**
+	 * Get the horizontal padding around the text drawn on the switch itself.
+	 * 
+	 * @return Horizontal padding for switch thumb text in pixels
+	 * 
+	 * @attr ref android.R.styleable#Switch_thumbTextPadding
+	 */
+	public int getThumbTextPadding()
+	{
+		return mThumbTextPadding;
+	}
+
+	/**
+	 * Set the drawable used for the track that the switch slides within.
+	 * 
+	 * @param track
+	 *            Track drawable
+	 * 
+	 * @attr ref android.R.styleable#Switch_track
+	 */
+	public void setTrackDrawable(Drawable track)
+	{
+		mTrackDrawable = track;
+		requestLayout();
+	}
+
+	/**
+	 * Set the drawable used for the track that the switch slides within.
+	 * 
+	 * @param resId
+	 *            Resource ID of a track drawable
+	 * 
+	 * @attr ref android.R.styleable#Switch_track
+	 */
+	public void setTrackResource(int resId)
+	{
+		setTrackDrawable(getContext().getResources().getDrawable(resId));
+	}
+
+	/**
+	 * Get the drawable used for the track that the switch slides within.
+	 * 
+	 * @return Track drawable
+	 * 
+	 * @attr ref android.R.styleable#Switch_track
+	 */
+	public Drawable getTrackDrawable()
+	{
+		return mTrackDrawable;
+	}
+
+	/**
+	 * Set the drawable used for the switch "thumb" - the piece that the user can physically touch and drag along the track.
+	 * 
+	 * @param thumb
+	 *            Thumb drawable
+	 * 
+	 * @attr ref android.R.styleable#Switch_thumb
+	 */
+	public void setThumbDrawable(Drawable thumb)
+	{
+		mThumbDrawable = thumb;
+		requestLayout();
+	}
+
+	/**
+	 * Set the drawable used for the switch "thumb" - the piece that the user can physically touch and drag along the track.
+	 * 
+	 * @param resId
+	 *            Resource ID of a thumb drawable
+	 * 
+	 * @attr ref android.R.styleable#Switch_thumb
+	 */
+	public void setThumbResource(int resId)
+	{
+		setThumbDrawable(getContext().getResources().getDrawable(resId));
+	}
+
+	/**
+	 * Get the drawable used for the switch "thumb" - the piece that the user can physically touch and drag along the track.
+	 * 
+	 * @return Thumb drawable
+	 * 
+	 * @attr ref android.R.styleable#Switch_thumb
+	 */
+	public Drawable getThumbDrawable()
+	{
+		return mThumbDrawable;
+	}
+
+	/**
+	 * Returns the text displayed when the button is in the checked state.
+	 * 
+	 * @attr ref android.R.styleable#Switch_textOn
+	 */
+	public CharSequence getTextOn()
+	{
+		return mTextOn;
+	}
+
+	/**
+	 * Sets the text displayed when the button is in the checked state.
+	 * 
+	 * @attr ref android.R.styleable#Switch_textOn
+	 */
+	public void setTextOn(CharSequence textOn)
+	{
+		mTextOn = textOn;
+		requestLayout();
+	}
+
+	/**
+	 * Returns the text displayed when the button is not in the checked state.
+	 * 
+	 * @attr ref android.R.styleable#Switch_textOff
+	 */
+	public CharSequence getTextOff()
+	{
+		return mTextOff;
+	}
+
+	/**
+	 * Sets the text displayed when the button is not in the checked state.
+	 * 
+	 * @attr ref android.R.styleable#Switch_textOff
+	 */
+	public void setTextOff(CharSequence textOff)
+	{
+		mTextOff = textOff;
+		requestLayout();
+	}
+
+	@Override
+	public void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
+	{
+		if (mOnLayout == null)
+		{
+			mOnLayout = makeLayout(mTextOn);
+		}
+		if (mOffLayout == null)
+		{
+			mOffLayout = makeLayout(mTextOff);
+		}
+
+		mTrackDrawable.getPadding(mTempRect);
+		final int maxTextWidth = Math.max(mOnLayout.getWidth(), mOffLayout.getWidth());
+		final int switchWidth = Math.max(mSwitchMinWidth, maxTextWidth * 2 + mThumbTextPadding * 4 + mTempRect.left + mTempRect.right);
+		final int switchHeight = mTrackDrawable.getIntrinsicHeight();
+
+		mThumbWidth = maxTextWidth + mThumbTextPadding * 2;
+
+		mSwitchWidth = switchWidth;
+		mSwitchHeight = switchHeight;
+
+		super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+		final int measuredHeight = getMeasuredHeight();
+		if (measuredHeight < switchHeight)
+		{
+			setMeasuredDimension(getMeasuredWidth(), switchHeight);
+		}
+	}
+
+	// TODO add onPopulateAccessibilityEvent(AccessibilityEvent event)
+	// @Override
+	// public void onPopulateAccessibilityEvent(AccessibilityEvent event)
+	// {
+	// super.onPopulateAccessibilityEvent(event);
+	// Layout layout = isChecked() ? mOnLayout : mOffLayout;
+	// if (layout != null && !TextUtils.isEmpty(layout.getText()))
+	// {
+	// event.getText().add(layout.getText());
+	// }
+	// }
+
+	@SuppressLint("FloatMath")
+	private Layout makeLayout(CharSequence text)
+	{
+		final CharSequence transformed = (mSwitchTransformationMethod != null) ? mSwitchTransformationMethod.getTransformation(text, this) : text;
+		return new StaticLayout(transformed, mTextPaint, (int) FloatMath.ceil(Layout.getDesiredWidth(transformed, mTextPaint)), Layout.Alignment.ALIGN_NORMAL, 1.f, 0, true);
+	}
+
+	/**
+	 * @return true if (x, y) is within the target area of the switch thumb
+	 */
+	private boolean hitThumb(float x, float y)
+	{
+		mThumbDrawable.getPadding(mTempRect);
+		final int thumbTop = mSwitchTop - mTouchSlop;
+		final int thumbLeft = mSwitchLeft + (int) (mThumbPosition + 0.5f) - mTouchSlop;
+		final int thumbRight = thumbLeft + mThumbWidth + mTempRect.left + mTempRect.right + mTouchSlop;
+		final int thumbBottom = mSwitchBottom + mTouchSlop;
+		return x > thumbLeft && x < thumbRight && y > thumbTop && y < thumbBottom;
+	}
+
+	@Override
+	public boolean onTouchEvent(MotionEvent ev)
+	{
+		mVelocityTracker.addMovement(ev);
+		final int action = ev.getActionMasked();
+		switch (action)
+		{
+			case MotionEvent.ACTION_DOWN:
+			{
+				final float x = ev.getX();
+				final float y = ev.getY();
+				if (isEnabled() && hitThumb(x, y))
+				{
+					mTouchMode = TOUCH_MODE_DOWN;
+					mTouchX = x;
+					mTouchY = y;
+				}
+				break;
+			}
+
+			case MotionEvent.ACTION_MOVE:
+			{
+				switch (mTouchMode)
+				{
+					case TOUCH_MODE_IDLE:
+						// Didn't target the thumb, treat normally.
+						break;
+
+					case TOUCH_MODE_DOWN:
+					{
+						final float x = ev.getX();
+						final float y = ev.getY();
+						if (Math.abs(x - mTouchX) > mTouchSlop || Math.abs(y - mTouchY) > mTouchSlop)
+						{
+							mTouchMode = TOUCH_MODE_DRAGGING;
+							getParent().requestDisallowInterceptTouchEvent(true);
+							mTouchX = x;
+							mTouchY = y;
+							return true;
+						}
+						break;
+					}
+
+					case TOUCH_MODE_DRAGGING:
+					{
+						final float x = ev.getX();
+						final float dx = x - mTouchX;
+						float newPos = Math.max(0, Math.min(mThumbPosition + dx, getThumbScrollRange()));
+						if (newPos != mThumbPosition)
+						{
+							mThumbPosition = newPos;
+							mTouchX = x;
+							invalidate();
+						}
+						return true;
+					}
+				}
+				break;
+			}
+
+			case MotionEvent.ACTION_UP:
+			case MotionEvent.ACTION_CANCEL:
+			{
+				if (mTouchMode == TOUCH_MODE_DRAGGING)
+				{
+					stopDrag(ev);
+					return true;
+				}
+				mTouchMode = TOUCH_MODE_IDLE;
+				mVelocityTracker.clear();
+				break;
+			}
+		}
+
+		return super.onTouchEvent(ev);
+	}
+
+	private void cancelSuperTouch(MotionEvent ev)
+	{
+		MotionEvent cancel = MotionEvent.obtain(ev);
+		cancel.setAction(MotionEvent.ACTION_CANCEL);
+		super.onTouchEvent(cancel);
+		cancel.recycle();
+	}
+
+	/**
+	 * Called from onTouchEvent to end a drag operation.
+	 * 
+	 * @param ev
+	 *            Event that triggered the end of drag mode - ACTION_UP or ACTION_CANCEL
+	 */
+	private void stopDrag(MotionEvent ev)
+	{
+		mTouchMode = TOUCH_MODE_IDLE;
+		// Up and not canceled, also checks the switch has not been disabled during the drag
+		boolean commitChange = ev.getAction() == MotionEvent.ACTION_UP && isEnabled();
+
+		cancelSuperTouch(ev);
+
+		if (commitChange)
+		{
+			boolean newState;
+			mVelocityTracker.computeCurrentVelocity(1000);
+			float xvel = mVelocityTracker.getXVelocity();
+			if (Math.abs(xvel) > mMinFlingVelocity)
+			{
+				// newState = isLayoutRtl() ? (xvel < 0) : (xvel > 0);
+				newState = xvel > 0;
+			}
+			else
+			{
+				newState = getTargetCheckedState();
+			}
+			animateThumbToCheckedState(newState);
+		}
+		else
+		{
+			animateThumbToCheckedState(isChecked());
+		}
+	}
+
+	private void animateThumbToCheckedState(boolean newCheckedState)
+	{
+		// TODO animate!
+		// float targetPos = newCheckedState ? 0 : getThumbScrollRange();
+		// mThumbPosition = targetPos;
+		setChecked(newCheckedState);
+	}
+
+	private boolean getTargetCheckedState()
+	{
+		return mThumbPosition >= getThumbScrollRange() / 2;
+	}
+
+	private void setThumbPosition(boolean checked)
+	{
+		mThumbPosition = checked ? getThumbScrollRange() : 0;
+	}
+
+	@Override
+	public void setChecked(boolean checked)
+	{
+		super.setChecked(checked);
+		setThumbPosition(isChecked());
+		invalidate();
+	}
+
+	@Override
+	protected void onLayout(boolean changed, int left, int top, int right, int bottom)
+	{
+		super.onLayout(changed, left, top, right, bottom);
+
+		setThumbPosition(isChecked());
+
+		int switchRight;
+		int switchLeft;
+
+		switchRight = getWidth() - getPaddingRight();
+		switchLeft = switchRight - mSwitchWidth;
+
+		int switchTop = 0;
+		int switchBottom = 0;
+		switch (getGravity() & Gravity.VERTICAL_GRAVITY_MASK)
+		{
+			default:
+			case Gravity.TOP:
+				switchTop = getPaddingTop();
+				switchBottom = switchTop + mSwitchHeight;
+				break;
+
+			case Gravity.CENTER_VERTICAL:
+				switchTop = (getPaddingTop() + getHeight() - getPaddingBottom()) / 2 - mSwitchHeight / 2;
+				switchBottom = switchTop + mSwitchHeight;
+				break;
+
+			case Gravity.BOTTOM:
+				switchBottom = getHeight() - getPaddingBottom();
+				switchTop = switchBottom - mSwitchHeight;
+				break;
+		}
+
+		mSwitchLeft = switchLeft;
+		mSwitchTop = switchTop;
+		mSwitchBottom = switchBottom;
+		mSwitchRight = switchRight;
+	}
+
+	@Override
+	protected void onDraw(Canvas canvas)
+	{
+		super.onDraw(canvas);
+
+		// Draw the switch
+		int switchLeft = mSwitchLeft;
+		int switchTop = mSwitchTop;
+		int switchRight = mSwitchRight;
+		int switchBottom = mSwitchBottom;
+
+		mTrackDrawable.setBounds(switchLeft, switchTop, switchRight, switchBottom);
+		mTrackDrawable.draw(canvas);
+
+		canvas.save();
+
+		mTrackDrawable.getPadding(mTempRect);
+		int switchInnerLeft = switchLeft + mTempRect.left;
+		int switchInnerTop = switchTop + mTempRect.top;
+		int switchInnerRight = switchRight - mTempRect.right;
+		int switchInnerBottom = switchBottom - mTempRect.bottom;
+		canvas.clipRect(switchInnerLeft, switchTop, switchInnerRight, switchBottom);
+
+		mThumbDrawable.getPadding(mTempRect);
+		final int thumbPos = (int) (mThumbPosition + 0.5f);
+		int thumbLeft = switchInnerLeft - mTempRect.left + thumbPos;
+		int thumbRight = switchInnerLeft + thumbPos + mThumbWidth + mTempRect.right;
+
+		mThumbDrawable.setBounds(thumbLeft, switchTop, thumbRight, switchBottom);
+		mThumbDrawable.draw(canvas);
+
+		// mTextColors should not be null, but just in case
+		if (mTextColors != null)
+		{
+			mTextPaint.setColor(mTextColors.getColorForState(getDrawableState(), mTextColors.getDefaultColor()));
+		}
+		mTextPaint.drawableState = getDrawableState();
+
+		Layout switchText = getTargetCheckedState() ? mOnLayout : mOffLayout;
+		if (switchText != null)
+		{
+			canvas.translate((thumbLeft + thumbRight) / 2 - switchText.getWidth() / 2, (switchInnerTop + switchInnerBottom) / 2 - switchText.getHeight() / 2);
+			switchText.draw(canvas);
+		}
+
+		canvas.restore();
+	}
+
+	@Override
+	public int getCompoundPaddingRight()
+	{
+		int padding = super.getCompoundPaddingRight() + mSwitchWidth;
+		if (!TextUtils.isEmpty(getText()))
+		{
+			padding += mSwitchPadding;
+		}
+		return padding;
+	}
+
+	private int getThumbScrollRange()
+	{
+		if (mTrackDrawable == null)
+		{
+			return 0;
+		}
+		mTrackDrawable.getPadding(mTempRect);
+		return mSwitchWidth - mThumbWidth - mTempRect.left - mTempRect.right;
+	}
+
+	@Override
+	protected int[] onCreateDrawableState(int extraSpace)
+	{
+		final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
+		if (isChecked())
+		{
+			mergeDrawableStates(drawableState, CHECKED_STATE_SET);
+		}
+		return drawableState;
+	}
+
+	@Override
+	protected void drawableStateChanged()
+	{
+		super.drawableStateChanged();
+
+		int[] myDrawableState = getDrawableState();
+
+		// Set the state of the Drawable
+		// Drawable may be null when checked state is set from XML, from super constructor
+		if (mThumbDrawable != null)
+			mThumbDrawable.setState(myDrawableState);
+		if (mTrackDrawable != null)
+			mTrackDrawable.setState(myDrawableState);
+
+		invalidate();
+	}
+
+	@Override
+	protected boolean verifyDrawable(Drawable who)
+	{
+		return super.verifyDrawable(who) || who == mThumbDrawable || who == mTrackDrawable;
+	}
+
+	// TODO check if even necessary?!
+	// @Override
+	// public void jumpDrawablesToCurrentState()
+	// {
+	// super.jumpDrawablesToCurrentState();
+	// mThumbDrawable.jumpToCurrentState();
+	// mTrackDrawable.jumpToCurrentState();
+	// }
+
+	// TODO onInitializeAccessibilityEvent(AccessibilityEvent event)
+	// @Override
+	// public void onInitializeAccessibilityEvent(AccessibilityEvent event)
+	// {
+	// super.onInitializeAccessibilityEvent(event);
+	// event.setClassName(MySwitch.class.getName());
+	// }
+
+	// TODO onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info)
+	// @Override
+	// public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info)
+	// {
+	// super.onInitializeAccessibilityNodeInfo(info);
+	// info.setClassName(MySwitch.class.getName());
+	// CharSequence switchText = isChecked() ? mTextOn : mTextOff;
+	// if (!TextUtils.isEmpty(switchText))
+	// {
+	// CharSequence oldText = info.getText();
+	// if (TextUtils.isEmpty(oldText))
+	// {
+	// info.setText(switchText);
+	// }
+	// else
+	// {
+	// StringBuilder newText = new StringBuilder();
+	// newText.append(oldText).append(' ').append(switchText);
+	// info.setText(newText);
+	// }
+	// }
+	// }
+}
\ No newline at end of file
diff --git a/shell/debug/src/de/ankri/views/TwoStatePreference.java b/shell/debug/src/de/ankri/views/TwoStatePreference.java
new file mode 100644
index 000000000..a6ad2f24f
--- /dev/null
+++ b/shell/debug/src/de/ankri/views/TwoStatePreference.java
@@ -0,0 +1,305 @@
+/*
+ * This source is part of the
+ *      _____  ___   ____
+ *  __ / / _ \/ _ | / __/___  _______ _
+ * / // / , _/ __ |/ _/_/ _ \/ __/ _ `/
+ * \___/_/|_/_/ |_/_/ (_)___/_/  \_, /
+ *                              /___/
+ * repository.
+ *
+ * Copyright 2012 Benoit 'BoD' Lubek (BoD@JRAF.org).  All Rights Reserved.
+ * Copyright (C) 2012 Intrications (intrications.com)
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.ankri.views;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.TypedArray;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.preference.Preference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.TextView;
+//import android.view.accessibility.AccessibilityEvent;
+//import android.view.accessibility.AccessibilityManager;
+
+/**
+ * Common base class for preferences that have two selectable states, persist a
+ * boolean value in SharedPreferences, and may have dependent preferences that are
+ * enabled/disabled based on the current state.
+ */
+public abstract class TwoStatePreference extends Preference {
+
+    private CharSequence mSummaryOn;
+    private CharSequence mSummaryOff;
+    boolean mChecked;
+//    private boolean mSendClickAccessibilityEvent;
+    private boolean mDisableDependentsState;
+
+
+    public TwoStatePreference(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    public TwoStatePreference(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public TwoStatePreference(Context context) {
+        this(context, null);
+    }
+
+    @Override
+    protected void onClick() {
+        super.onClick();
+
+        boolean newValue = !isChecked();
+
+//        mSendClickAccessibilityEvent = true;
+
+        if (!callChangeListener(newValue)) {
+            return;
+        }
+
+        setChecked(newValue);
+    }
+
+    /**
+     * Sets the checked state and saves it to the {@link SharedPreferences}.
+     *
+     * @param checked The checked state.
+     */
+    public void setChecked(boolean checked) {
+        if (mChecked != checked) {
+            mChecked = checked;
+            persistBoolean(checked);
+            notifyDependencyChange(shouldDisableDependents());
+            notifyChanged();
+        }
+    }
+
+    /**
+     * Returns the checked state.
+     *
+     * @return The checked state.
+     */
+    public boolean isChecked() {
+        return mChecked;
+    }
+
+    @Override
+    public boolean shouldDisableDependents() {
+        boolean shouldDisable = mDisableDependentsState ? mChecked : !mChecked;
+        return shouldDisable || super.shouldDisableDependents();
+    }
+
+    /**
+     * Sets the summary to be shown when checked.
+     *
+     * @param summary The summary to be shown when checked.
+     */
+    public void setSummaryOn(CharSequence summary) {
+        mSummaryOn = summary;
+        if (isChecked()) {
+            notifyChanged();
+        }
+    }
+
+    /**
+     * @see #setSummaryOn(CharSequence)
+     * @param summaryResId The summary as a resource.
+     */
+    public void setSummaryOn(int summaryResId) {
+        setSummaryOn(getContext().getString(summaryResId));
+    }
+
+    /**
+     * Returns the summary to be shown when checked.
+     * @return The summary.
+     */
+    public CharSequence getSummaryOn() {
+        return mSummaryOn;
+    }
+
+    /**
+     * Sets the summary to be shown when unchecked.
+     *
+     * @param summary The summary to be shown when unchecked.
+     */
+    public void setSummaryOff(CharSequence summary) {
+        mSummaryOff = summary;
+        if (!isChecked()) {
+            notifyChanged();
+        }
+    }
+
+    /**
+     * @see #setSummaryOff(CharSequence)
+     * @param summaryResId The summary as a resource.
+     */
+    public void setSummaryOff(int summaryResId) {
+        setSummaryOff(getContext().getString(summaryResId));
+    }
+
+    /**
+     * Returns the summary to be shown when unchecked.
+     * @return The summary.
+     */
+    public CharSequence getSummaryOff() {
+        return mSummaryOff;
+    }
+
+    /**
+     * Returns whether dependents are disabled when this preference is on ({@code true})
+     * or when this preference is off ({@code false}).
+     *
+     * @return Whether dependents are disabled when this preference is on ({@code true})
+     *         or when this preference is off ({@code false}).
+     */
+    public boolean getDisableDependentsState() {
+        return mDisableDependentsState;
+    }
+
+    /**
+     * Sets whether dependents are disabled when this preference is on ({@code true})
+     * or when this preference is off ({@code false}).
+     *
+     * @param disableDependentsState The preference state that should disable dependents.
+     */
+    public void setDisableDependentsState(boolean disableDependentsState) {
+        mDisableDependentsState = disableDependentsState;
+    }
+
+    @Override
+    protected Object onGetDefaultValue(TypedArray a, int index) {
+        return a.getBoolean(index, false);
+    }
+
+    @Override
+    protected void onSetInitialValue(boolean restoreValue, Object defaultValue) {
+        setChecked(restoreValue ? getPersistedBoolean(mChecked)
+                : (Boolean) defaultValue);
+    }
+
+//    void sendAccessibilityEvent(View view) {
+//        // Since the view is still not attached we create, populate,
+//        // and send the event directly since we do not know when it
+//        // will be attached and posting commands is not as clean.
+//        AccessibilityManager accessibilityManager = AccessibilityManager.getInstance(getContext());
+//        if (mSendClickAccessibilityEvent && accessibilityManager.isEnabled()) {
+//            AccessibilityEvent event = AccessibilityEvent.obtain();
+//            event.setEventType(AccessibilityEvent.TYPE_VIEW_CLICKED);
+//            view.onInitializeAccessibilityEvent(event);
+//            view.dispatchPopulateAccessibilityEvent(event);
+//            accessibilityManager.sendAccessibilityEvent(event);
+//        }
+//        mSendClickAccessibilityEvent = false;
+//    }
+
+    /**
+     * Sync a summary view contained within view's subhierarchy with the correct summary text.
+     * @param view View where a summary should be located
+     */
+    void syncSummaryView(View view) {
+        // Sync the summary view
+        TextView summaryView = (TextView) view.findViewById(android.R.id.summary);
+        if (summaryView != null) {
+            boolean useDefaultSummary = true;
+            if (mChecked && mSummaryOn != null) {
+                summaryView.setText(mSummaryOn);
+                useDefaultSummary = false;
+            } else if (!mChecked && mSummaryOff != null) {
+                summaryView.setText(mSummaryOff);
+                useDefaultSummary = false;
+            }
+
+            if (useDefaultSummary) {
+                final CharSequence summary = getSummary();
+                if (summary != null) {
+                    summaryView.setText(summary);
+                    useDefaultSummary = false;
+                }
+            }
+
+            int newVisibility = View.GONE;
+            if (!useDefaultSummary) {
+                // Someone has written to it
+                newVisibility = View.VISIBLE;
+            }
+            if (newVisibility != summaryView.getVisibility()) {
+                summaryView.setVisibility(newVisibility);
+            }
+        }
+    }
+
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        final Parcelable superState = super.onSaveInstanceState();
+        if (isPersistent()) {
+            // No need to save instance state since it's persistent
+            return superState;
+        }
+
+        final SavedState myState = new SavedState(superState);
+        myState.checked = isChecked();
+        return myState;
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Parcelable state) {
+        if (state == null || !state.getClass().equals(SavedState.class)) {
+            // Didn't save state for us in onSaveInstanceState
+            super.onRestoreInstanceState(state);
+            return;
+        }
+
+        SavedState myState = (SavedState) state;
+        super.onRestoreInstanceState(myState.getSuperState());
+        setChecked(myState.checked);
+    }
+
+    static class SavedState extends BaseSavedState {
+        boolean checked;
+
+        public SavedState(Parcel source) {
+            super(source);
+            checked = source.readInt() == 1;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            super.writeToParcel(dest, flags);
+            dest.writeInt(checked ? 1 : 0);
+        }
+
+        public SavedState(Parcelable superState) {
+            super(superState);
+        }
+
+        public static final Parcelable.Creator<SavedState> CREATOR =
+                new Parcelable.Creator<SavedState>() {
+            public SavedState createFromParcel(Parcel in) {
+                return new SavedState(in);
+            }
+
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
+    }
+}
\ No newline at end of file

From b14440970b13be0a985cdbef620558c2e919e028 Mon Sep 17 00:00:00 2001
From: TwistedUmbrella <twistedumbrella@gmail.com>
Date: Mon, 3 Mar 2014 16:40:12 -0500
Subject: [PATCH 4/7] Fix the server counterpart to be able to use JSON parsing

---
 .../src/com/reicast/emulator/debug/Debug.java |  4 +--
 .../emulator/debug/GcmBroadcastReceiver.java  |  6 ++---
 .../emulator/debug/RequestArchive.java        | 25 ++++++++++---------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/shell/debug/src/com/reicast/emulator/debug/Debug.java b/shell/debug/src/com/reicast/emulator/debug/Debug.java
index f96445e37..62056670c 100644
--- a/shell/debug/src/com/reicast/emulator/debug/Debug.java
+++ b/shell/debug/src/com/reicast/emulator/debug/Debug.java
@@ -425,7 +425,7 @@ public class Debug extends Activity {
 				boolean hasIdentitiy = false;
 				String identity = mPrefs.getString(PREF_IDENTITY, "?");
 				if (!identity.equals("?")) {
-					mPairs.add(new BasicNameValuePair("sender", "reicast tester "
+					mPairs.add(new BasicNameValuePair("sender", "reicast tester #"
 							+ identity));
 					hasIdentitiy = true;
 				} else {
@@ -535,7 +535,7 @@ public class Debug extends Activity {
 				if (!identity.equals("Err")) {
 					mPrefs.edit().putString(PREF_IDENTITY, identity).commit();
 				}
-				Log.d(APP_TAG, "reicast tester " + identity);
+				Log.d(APP_TAG, "reicast tester #" + identity);
 			}
 		}
 
diff --git a/shell/debug/src/com/reicast/emulator/debug/GcmBroadcastReceiver.java b/shell/debug/src/com/reicast/emulator/debug/GcmBroadcastReceiver.java
index e54aa14e0..15c3d39ce 100644
--- a/shell/debug/src/com/reicast/emulator/debug/GcmBroadcastReceiver.java
+++ b/shell/debug/src/com/reicast/emulator/debug/GcmBroadcastReceiver.java
@@ -37,7 +37,7 @@ public class GcmBroadcastReceiver extends BroadcastReceiver {
 				Log.d(TAG, "Sender: " + sender);
 				String message = extras.getString("message");
 				if (!message.equals("")) {
-					if (sender.contains("reicast tester ")) {
+					if (sender.contains("reicast tester #")) {
 						sendNotification(sender, message);
 					}
 				}
@@ -50,13 +50,13 @@ public class GcmBroadcastReceiver extends BroadcastReceiver {
 	private void sendNotification(String sender, String message) {
 		SharedPreferences prefs = PreferenceManager
 				.getDefaultSharedPreferences(mContext);
-		final String number = sender.replace("reicast tester ", "");
+		final String number = sender.replace("reicast tester #", "");
 		long timestamp = System.currentTimeMillis();
 		int reference = (int) timestamp;
 		if (prefs.getBoolean("enable_messaging", true)) {
 			NotificationManager notificationManager = (NotificationManager) mContext
 					.getSystemService(Context.NOTIFICATION_SERVICE);
-			String title = "New reicast message!";
+			String title = "New reicast tester message!";
 			Notification notification;
 			Intent notificationIntent = new Intent(mContext, Debug.class);
 			// notificationIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
diff --git a/shell/debug/src/com/reicast/emulator/debug/RequestArchive.java b/shell/debug/src/com/reicast/emulator/debug/RequestArchive.java
index 8094371c1..818babd23 100644
--- a/shell/debug/src/com/reicast/emulator/debug/RequestArchive.java
+++ b/shell/debug/src/com/reicast/emulator/debug/RequestArchive.java
@@ -65,6 +65,8 @@ import org.apache.http.client.ResponseHandler;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.impl.client.BasicResponseHandler;
 import org.apache.http.impl.client.DefaultHttpClient;
+import org.json.JSONArray;
+import org.json.JSONObject;
 
 import android.annotation.SuppressLint;
 import android.os.AsyncTask;
@@ -86,23 +88,22 @@ public class RequestArchive extends AsyncTask<String, String, List<String[]>> {
 	@Override
 	protected List<String[]> doInBackground(String... urls) {
 		try {
-			List<String[]> message = new ArrayList<String[]>();
+			List<String[]> messages = new ArrayList<String[]>();
 			HttpClient client = new DefaultHttpClient();
 			HttpPost post = new HttpPost(urls[0]);
 			ResponseHandler<String> responseHandler = new BasicResponseHandler();
 			String response = client.execute(post, responseHandler);
-			if (response.contains("[") && response.contains("]")) {
-				String[] jsonString = response.split(" , ");
-				for (String jsonText : jsonString) {
-					if (jsonText.contains("[\"")) {
-						jsonText = jsonText.replace("[\"", "");
-					}
-					if (jsonText.contains("\"]")) {
-						jsonText = jsonText.replace("\"]", "");
-					}
-					message.add(jsonText.split("\",\""));
+			if (response.contains("{") && response.contains("}")) {
+				JSONObject archive = new JSONObject(response);
+				JSONArray items = archive.getJSONArray("archive");
+				for (int i = 0; i < items.length(); i++) {
+					JSONObject log = items.getJSONObject(i);
+					String id = log.getString("identifier");
+					String msg = log.getString("message");
+					String date = log.getString("created_at");
+					messages.add(new String[] { id, msg, date });
 				}
-				return message;
+				return messages;
 			}
 			return null;
 

From deba6cbcd1d13f74fa927b415f7445cba316592d Mon Sep 17 00:00:00 2001
From: TwistedUmbrella <twistedumbrella@gmail.com>
Date: Mon, 3 Mar 2014 17:30:19 -0500
Subject: [PATCH 5/7] Fix automated NDK build on windows, Add x86 to touchpad

---
 shell/android/build.xml                 | 16 ---------------
 shell/android/custom_rules.xml          | 27 +++++++++++++++++++++++++
 shell/android/xperia/jni/Application.mk |  4 ++--
 3 files changed, 29 insertions(+), 18 deletions(-)
 create mode 100644 shell/android/custom_rules.xml

diff --git a/shell/android/build.xml b/shell/android/build.xml
index 47dc9c9a2..a5c2daa35 100644
--- a/shell/android/build.xml
+++ b/shell/android/build.xml
@@ -70,22 +70,6 @@
             -pre-clean
     -->
     <import file="custom_rules.xml" optional="true" />
-    <property name="ndkbuildopt" value=""/>
-    <target name="-pre-build">
-        <exec executable="${ndk.dir}/ndk-build" failonerror="true">
-            <arg line="-j4 ${ndkbuildopt}"/>
-        </exec>
-        <copy todir="${jar.libs.dir}/armeabi-v7a">
-            <fileset
-			dir="xperia/libs/armeabi-v7a"
-			includes="libsexplay.so" />
-        </copy>
-    </target>
-    <target name="clean" depends="android_rules.clean">
-        <exec executable="${ndk.dir}/ndk-build" failonerror="true">
-            <arg value="clean"/>
-        </exec>
-    </target>
 
     <!-- Import the actual build file.
 
diff --git a/shell/android/custom_rules.xml b/shell/android/custom_rules.xml
new file mode 100644
index 000000000..72e6a6da8
--- /dev/null
+++ b/shell/android/custom_rules.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="reicast-touchpad" default="help">
+    <property name="ndkbuildopt" value=""/>
+    <target name="-pre-build">
+        <exec executable="${ndk.dir}/ndk-build.cmd" failonerror="true" osfamily="windows">
+            <arg line="-j8 ${ndkbuildopt}"/>
+        </exec>
+        <exec executable="${ndk.dir}/ndk-build" failonerror="true" osfamily="unix">
+            <arg line="-j8 ${ndkbuildopt}"/>
+        </exec>
+        <copy todir="${jar.libs.dir}/armeabi-v7a">
+            <fileset
+			dir="xperia/libs/armeabi-v7a"
+			includes="libsexplay.so" />
+        </copy>
+        <copy todir="${jar.libs.dir}/x86">
+            <fileset
+			dir="xperia/libs/x86"
+			includes="libsexplay.so" />
+        </copy>
+    </target>
+    <target name="clean" depends="android_rules.clean">
+        <exec executable="${ndk.dir}/ndk-build" failonerror="true">
+            <arg value="clean"/>
+        </exec>
+    </target>
+</project>
diff --git a/shell/android/xperia/jni/Application.mk b/shell/android/xperia/jni/Application.mk
index 7f414647d..9d685c750 100644
--- a/shell/android/xperia/jni/Application.mk
+++ b/shell/android/xperia/jni/Application.mk
@@ -1,4 +1,4 @@
-#APP_ABI 	:= armeabi-v7a x86
-APP_ABI		:= armeabi-v7a
+APP_ABI 	:= armeabi-v7a x86
+#APP_ABI		:= armeabi-v7a
 APP_PLATFORM	:= android-9
 NDK_TOOLCHAIN_VERSION := 4.8
\ No newline at end of file

From 8a34119c5d0d880749d9dfde1156cf192d815dc2 Mon Sep 17 00:00:00 2001
From: TwistedUmbrella <twistedumbrella@gmail.com>
Date: Mon, 3 Mar 2014 17:35:46 -0500
Subject: [PATCH 6/7] Missed that secondary platform-dependent command call

---
 shell/android/custom_rules.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/shell/android/custom_rules.xml b/shell/android/custom_rules.xml
index 72e6a6da8..871abf69a 100644
--- a/shell/android/custom_rules.xml
+++ b/shell/android/custom_rules.xml
@@ -20,7 +20,10 @@
         </copy>
     </target>
     <target name="clean" depends="android_rules.clean">
-        <exec executable="${ndk.dir}/ndk-build" failonerror="true">
+        <exec executable="${ndk.dir}/ndk-build.cmd" failonerror="true" osfamily="windows">
+            <arg value="clean"/>
+        </exec>
+        <exec executable="${ndk.dir}/ndk-build" failonerror="true" osfamily="unix">
             <arg value="clean"/>
         </exec>
     </target>

From 97fb6287973678e117e704a75ed165abba94263f Mon Sep 17 00:00:00 2001
From: TwistedUmbrella <twistedumbrella@gmail.com>
Date: Mon, 3 Mar 2014 17:38:05 -0500
Subject: [PATCH 7/7] This may help reduce the possibility for error in the
 Mogas

---
 .../reicast/emulator/periph/MOGAInput.java    | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/shell/android/src/com/reicast/emulator/periph/MOGAInput.java b/shell/android/src/com/reicast/emulator/periph/MOGAInput.java
index ecd9659f5..63a4ad12f 100644
--- a/shell/android/src/com/reicast/emulator/periph/MOGAInput.java
+++ b/shell/android/src/com/reicast/emulator/periph/MOGAInput.java
@@ -10,6 +10,7 @@ import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Handler;
 import android.preference.PreferenceManager;
+import android.util.Log;
 import android.widget.Toast;
 
 import com.bda.controller.Controller;
@@ -37,7 +38,6 @@ public class MOGAInput
 	static final int ACTION_VERSION_MOGAPRO = Controller.ACTION_VERSION_MOGAPRO;
 
 	public Controller mController = null;
-	private Handler handler;
 	private String notify;
 	private Gamepad pad;
 
@@ -80,8 +80,7 @@ public class MOGAInput
 		this.act = act;
 
 		this.pad = pad;
-		
-		handler = new Handler();
+
 		prefs = PreferenceManager
 				.getDefaultSharedPreferences(act.getApplicationContext());
 
@@ -157,7 +156,6 @@ public class MOGAInput
 			pad.custom[playerNum] = prefs.getBoolean("modified_key_layout" + id, false);
 			pad.compat[playerNum] = prefs.getBoolean("controller_compat" + id, false);
 			pad.joystick[playerNum] = prefs.getBoolean("separate_joystick" + id, false);
-			pad.isActiveMoga[playerNum] = true;
 			if (pad.compat[playerNum]) {
 				getCompatibilityMap(playerNum, id);
 			} else if (pad.custom[playerNum]) {
@@ -166,11 +164,6 @@ public class MOGAInput
 				pad.map[playerNum] = pad.getMogaController();
 			}
 			initJoyStickLayout(playerNum);
-			handler.post(new Runnable() {
-				public void run() {
-					Toast.makeText(act.getApplicationContext(), notify, Toast.LENGTH_SHORT).show();
-				}
-			});
 		}
 
 		public void onStateEvent(StateEvent event)
@@ -191,12 +184,14 @@ public class MOGAInput
         		int mControllerVersion = mController.getState(Controller.STATE_CURRENT_PRODUCT_VERSION);
         		if (mControllerVersion == Controller.ACTION_VERSION_MOGAPRO) {
         			pad.isMogaPro[playerNum] = true;
-        			notify = act.getApplicationContext().getString(R.string.moga_pro_connect);
+        			pad.isActiveMoga[playerNum] = true;
+        			Log.d("com.reicast.emulator", act.getApplicationContext().getString(R.string.moga_pro_connect));
         		} else if (mControllerVersion == Controller.ACTION_VERSION_MOGA) {
         			pad.isMogaPro[playerNum] = false;
-        			notify = act.getApplicationContext().getString(R.string.moga_connect);
+        			pad.isActiveMoga[playerNum] = true;
+        			Log.d("com.reicast.emulator", act.getApplicationContext().getString(R.string.moga_connect));
         		}
-        		if (notify != null && !notify.equals(null)) {
+        		if (pad.isActiveMoga[playerNum]) {
         			notifyMogaConnected(notify, playerNum);
         		}
 			}