We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] SDL2 patch file

SDL2.patch (text/plain), 288.10 KB, created by lennie.araki on 2014-02-12 03:52:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lennie.araki

Created: 2014-02-12 03:52:07 UTC

Size: 288.10 KB

patch

obsolete

>diff -r 1b62b081a83b VisualC/SDLmain/SDLmain_VS2008.vcproj
>--- a/VisualC/SDLmain/SDLmain_VS2008.vcproj	Wed Jan 22 12:39:34 2014 -0500
>+++ b/VisualC/SDLmain/SDLmain_VS2008.vcproj	Tue Feb 11 19:49:36 2014 -0800
>@@ -83,6 +83,133 @@
> 			/>
> 			<Tool
> 				Name="VCPostBuildEventTool"
>+				CommandLine="mkdir ..\..\lib&#x0D;&#x0A;mkdir ..\..\lib\x86&#x0D;&#x0A;copy $(OutDir)\$(ProjectName).lib ..\..\lib\x86&#x0D;&#x0A;"
>+			/>
>+		</Configuration>
>+		<Configuration
>+			Name="Release_NoSTDIO|Win32"
>+			IntermediateDirectory="$(ConfigurationName)"
>+			ConfigurationType="1"
>+			>
>+			<Tool
>+				Name="VCPreBuildEventTool"
>+			/>
>+			<Tool
>+				Name="VCCustomBuildTool"
>+			/>
>+			<Tool
>+				Name="VCXMLDataGeneratorTool"
>+			/>
>+			<Tool
>+				Name="VCWebServiceProxyGeneratorTool"
>+			/>
>+			<Tool
>+				Name="VCMIDLTool"
>+			/>
>+			<Tool
>+				Name="VCCLCompilerTool"
>+				ExceptionHandling="0"
>+				DebugInformationFormat="1"
>+			/>
>+			<Tool
>+				Name="VCManagedResourceCompilerTool"
>+			/>
>+			<Tool
>+				Name="VCResourceCompilerTool"
>+			/>
>+			<Tool
>+				Name="VCPreLinkEventTool"
>+			/>
>+			<Tool
>+				Name="VCLinkerTool"
>+			/>
>+			<Tool
>+				Name="VCALinkTool"
>+			/>
>+			<Tool
>+				Name="VCManifestTool"
>+			/>
>+			<Tool
>+				Name="VCXDCMakeTool"
>+			/>
>+			<Tool
>+				Name="VCBscMakeTool"
>+			/>
>+			<Tool
>+				Name="VCFxCopTool"
>+			/>
>+			<Tool
>+				Name="VCAppVerifierTool"
>+			/>
>+			<Tool
>+				Name="VCPostBuildEventTool"
>+				CommandLine="mkdir ..\..\lib&#x0D;&#x0A;mkdir ..\..\lib\x86&#x0D;&#x0A;copy $(OutDir)\$(ProjectName).lib ..\..\lib\x86&#x0D;&#x0A;"
>+			/>
>+		</Configuration>
>+		<Configuration
>+			Name="Debug|Win32"
>+			OutputDirectory=".\Debug"
>+			IntermediateDirectory=".\Debug"
>+			ConfigurationType="4"
>+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
>+			UseOfMFC="0"
>+			ATLMinimizesCRunTimeLibraryUsage="false"
>+			>
>+			<Tool
>+				Name="VCPreBuildEventTool"
>+				CommandLine=""
>+			/>
>+			<Tool
>+				Name="VCCustomBuildTool"
>+			/>
>+			<Tool
>+				Name="VCXMLDataGeneratorTool"
>+			/>
>+			<Tool
>+				Name="VCWebServiceProxyGeneratorTool"
>+			/>
>+			<Tool
>+				Name="VCMIDLTool"
>+			/>
>+			<Tool
>+				Name="VCCLCompilerTool"
>+				Optimization="0"
>+				AdditionalIncludeDirectories="..\..\include,..\..\include\SDL"
>+				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS"
>+				ExceptionHandling="0"
>+				RuntimeLibrary="3"
>+				WarningLevel="3"
>+				SuppressStartupBanner="true"
>+				DebugInformationFormat="1"
>+				CompileAs="0"
>+			/>
>+			<Tool
>+				Name="VCManagedResourceCompilerTool"
>+			/>
>+			<Tool
>+				Name="VCResourceCompilerTool"
>+			/>
>+			<Tool
>+				Name="VCPreLinkEventTool"
>+			/>
>+			<Tool
>+				Name="VCLibrarianTool"
>+			/>
>+			<Tool
>+				Name="VCALinkTool"
>+			/>
>+			<Tool
>+				Name="VCXDCMakeTool"
>+			/>
>+			<Tool
>+				Name="VCBscMakeTool"
>+			/>
>+			<Tool
>+				Name="VCFxCopTool"
>+			/>
>+			<Tool
>+				Name="VCPostBuildEventTool"
>+				CommandLine="mkdir ..\..\lib&#x0D;&#x0A;mkdir ..\..\lib\x86&#x0D;&#x0A;copy $(OutDir)\$(ProjectName).lib ..\..\lib\x86&#x0D;&#x0A;"
> 			/>
> 		</Configuration>
> 		<Configuration
>@@ -153,65 +280,6 @@
> 			/>
> 		</Configuration>
> 		<Configuration
>-			Name="Release_NoSTDIO|Win32"
>-			IntermediateDirectory="$(ConfigurationName)"
>-			ConfigurationType="1"
>-			>
>-			<Tool
>-				Name="VCPreBuildEventTool"
>-			/>
>-			<Tool
>-				Name="VCCustomBuildTool"
>-			/>
>-			<Tool
>-				Name="VCXMLDataGeneratorTool"
>-			/>
>-			<Tool
>-				Name="VCWebServiceProxyGeneratorTool"
>-			/>
>-			<Tool
>-				Name="VCMIDLTool"
>-			/>
>-			<Tool
>-				Name="VCCLCompilerTool"
>-				ExceptionHandling="0"
>-				DebugInformationFormat="1"
>-			/>
>-			<Tool
>-				Name="VCManagedResourceCompilerTool"
>-			/>
>-			<Tool
>-				Name="VCResourceCompilerTool"
>-			/>
>-			<Tool
>-				Name="VCPreLinkEventTool"
>-			/>
>-			<Tool
>-				Name="VCLinkerTool"
>-			/>
>-			<Tool
>-				Name="VCALinkTool"
>-			/>
>-			<Tool
>-				Name="VCManifestTool"
>-			/>
>-			<Tool
>-				Name="VCXDCMakeTool"
>-			/>
>-			<Tool
>-				Name="VCBscMakeTool"
>-			/>
>-			<Tool
>-				Name="VCFxCopTool"
>-			/>
>-			<Tool
>-				Name="VCAppVerifierTool"
>-			/>
>-			<Tool
>-				Name="VCPostBuildEventTool"
>-			/>
>-		</Configuration>
>-		<Configuration
> 			Name="Release_NoSTDIO|x64"
> 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
> 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
>@@ -281,71 +349,6 @@
> 			/>
> 		</Configuration>
> 		<Configuration
>-			Name="Debug|Win32"
>-			OutputDirectory=".\Debug"
>-			IntermediateDirectory=".\Debug"
>-			ConfigurationType="4"
>-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
>-			UseOfMFC="0"
>-			ATLMinimizesCRunTimeLibraryUsage="false"
>-			>
>-			<Tool
>-				Name="VCPreBuildEventTool"
>-				CommandLine=""
>-			/>
>-			<Tool
>-				Name="VCCustomBuildTool"
>-			/>
>-			<Tool
>-				Name="VCXMLDataGeneratorTool"
>-			/>
>-			<Tool
>-				Name="VCWebServiceProxyGeneratorTool"
>-			/>
>-			<Tool
>-				Name="VCMIDLTool"
>-			/>
>-			<Tool
>-				Name="VCCLCompilerTool"
>-				Optimization="0"
>-				AdditionalIncludeDirectories="..\..\include,..\..\include\SDL"
>-				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS"
>-				ExceptionHandling="0"
>-				RuntimeLibrary="3"
>-				WarningLevel="3"
>-				SuppressStartupBanner="true"
>-				DebugInformationFormat="1"
>-				CompileAs="0"
>-			/>
>-			<Tool
>-				Name="VCManagedResourceCompilerTool"
>-			/>
>-			<Tool
>-				Name="VCResourceCompilerTool"
>-			/>
>-			<Tool
>-				Name="VCPreLinkEventTool"
>-			/>
>-			<Tool
>-				Name="VCLibrarianTool"
>-			/>
>-			<Tool
>-				Name="VCALinkTool"
>-			/>
>-			<Tool
>-				Name="VCXDCMakeTool"
>-			/>
>-			<Tool
>-				Name="VCBscMakeTool"
>-			/>
>-			<Tool
>-				Name="VCFxCopTool"
>-			/>
>-			<Tool
>-				Name="VCPostBuildEventTool"
>-			/>
>-		</Configuration>
>-		<Configuration
> 			Name="Debug|x64"
> 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
> 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
>@@ -419,6 +422,4 @@
> 			>
> 		</File>
> 	</Files>
>-	<Globals>
>-	</Globals>
> </VisualStudioProject>
>diff -r 1b62b081a83b android/drummix/.classpath
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/drummix/.classpath	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,9 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<classpath>
>+	<classpathentry kind="src" path="src"/>
>+	<classpathentry kind="src" path="gen"/>
>+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
>+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
>+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
>+	<classpathentry kind="output" path="bin/classes"/>
>+</classpath>
>diff -r 1b62b081a83b android/drummix/.project
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/drummix/.project	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,33 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<projectDescription>
>+	<name>Drum Mix</name>
>+	<comment></comment>
>+	<projects>
>+	</projects>
>+	<buildSpec>
>+		<buildCommand>
>+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>org.eclipse.jdt.core.javabuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+	</buildSpec>
>+	<natures>
>+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
>+		<nature>org.eclipse.jdt.core.javanature</nature>
>+	</natures>
>+</projectDescription>
>diff -r 1b62b081a83b android/drummix/.settings/org.eclipse.ltk.core.refactoring.prefs
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/drummix/.settings/org.eclipse.ltk.core.refactoring.prefs	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,2 @@
>+eclipse.preferences.version=1
>+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
>diff -r 1b62b081a83b android/drummix/AndroidManifest.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/drummix/AndroidManifest.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,42 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+
>+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
>+      package="org.libsdl.drummix"
>+      android:versionCode="1"
>+      android:versionName="1.0"
>+      android:installLocation="auto">
>+
>+    
>+    <application android:label="@string/app_name"
>+                 android:icon="@drawable/ic_launcher"
>+                 android:allowBackup="true"
>+                 android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
>+        <activity android:name="SDLActivity"
>+                  android:label="@string/app_name">
>+            <intent-filter>
>+                <action android:name="android.intent.action.MAIN" />
>+                <category android:name="android.intent.category.LAUNCHER" />
>+            </intent-filter>
>+        </activity>
>+            
>+    </application>
>+
>+    
>+    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
>+
>+    
>+    <uses-feature android:glEsVersion="0x00020000" /> 
>+
>+    
>+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 
>+</manifest> 
>diff -r 1b62b081a83b android/drummix/ant.properties
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/drummix/ant.properties	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,17 @@
>+# This file is used to override default values used by the Ant build system.
>+#
>+# This file must be checked into Version Control Systems, as it is
>+# integral to the build system of your project.
>+
>+# This file is only used by the Ant script.
>+
>+# You can use this to override default values such as
>+#  'source.dir' for the location of your java source folder and
>+#  'out.dir' for the location of your output folder.
>+
>+# You can also use it define how the release builds are signed by declaring
>+# the following properties:
>+#  'key.store' for the location of your keystore and
>+#  'key.alias' for the name of the key to use.
>+# The password will be asked during the build when you use the 'release' target.
>+
>diff -r 1b62b081a83b android/drummix/build.properties
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/drummix/build.properties	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,17 @@
>+# This file is used to override default values used by the Ant build system.
>+# 
>+# This file must be checked in Version Control Systems, as it is
>+# integral to the build system of your project.
>+
>+# This file is only used by the Ant script.
>+
>+# You can use this to override default values such as
>+#  'source.dir' for the location of your java source folder and
>+#  'out.dir' for the location of your output folder.
>+
>+# You can also use it define how the release builds are signed by declaring
>+# the following properties:
>+#  'key.store' for the location of your keystore and
>+#  'key.alias' for the name of the key to use.
>+# The password will be asked during the build when you use the 'release' target.
>+
>diff -r 1b62b081a83b android/drummix/build.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/drummix/build.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,93 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+
>+<project name="Drum Mix" default="help">
>+
>+    
>+    <property file="local.properties" />
>+
>+    
>+    <property file="ant.properties" />
>+
>+    
>+    <property environment="env" />
>+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
>+        <isset property="env.ANDROID_HOME" />
>+    </condition>
>+
>+    
>+    <loadproperties srcFile="project.properties" />
>+
>+    
>+    <fail
>+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
>+            unless="sdk.dir"
>+    />
>+
>+    
>+    <import file="custom_rules.xml" optional="true" />
>+
>+    
>+    
>+    <import file="${sdk.dir}/tools/ant/build.xml" />
>+
>+</project>
>diff -r 1b62b081a83b android/drummix/clean.sh
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/drummix/clean.sh	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,5 @@
>+rm -rf bin
>+rm -rf gen
>+rm -rf obj
>+rm -rf libs
>+rm -f assets/*.wav
>diff -r 1b62b081a83b android/drummix/default.properties
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/drummix/default.properties	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,11 @@
>+# This file is automatically generated by Android Tools.
>+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
>+# 
>+# This file must be checked in Version Control Systems.
>+# 
>+# To customize properties used by the Ant build system use,
>+# "build.properties", and override values to adapt the script to your
>+# project structure.
>+
>+# Project target.
>+target=android-7
>diff -r 1b62b081a83b android/drummix/jni/Android.mk
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/drummix/jni/Android.mk	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,1 @@
>+include $(call all-subdir-makefiles)
>diff -r 1b62b081a83b android/drummix/jni/Application.mk
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/drummix/jni/Application.mk	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,6 @@
>+APP_ABI := armeabi x86
>+APP_PLATFORM := android-9
>+
>+# Uncomment this if you're using STL in your project
>+# See CPLUSPLUS-SUPPORT.html in the NDK documentation for more information
>+# APP_STL := stlport_static 
>diff -r 1b62b081a83b android/drummix/jni/SDL/Android.mk
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/drummix/jni/SDL/Android.mk	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,52 @@
>+LOCAL_PATH := $(SDL2_HOME)
>+
>+###########################
>+#
>+# SDL shared library
>+#
>+###########################
>+
>+include $(CLEAR_VARS)
>+
>+LOCAL_MODULE := SDL2
>+
>+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
>+
>+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
>+
>+LOCAL_SRC_FILES := \
>+	$(subst $(LOCAL_PATH)/,, \
>+	$(wildcard $(LOCAL_PATH)/src/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/audio/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/audio/android/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/audio/dummy/*.c) \
>+	$(LOCAL_PATH)/src/atomic/SDL_atomic.c \
>+	$(LOCAL_PATH)/src/atomic/SDL_spinlock.c.arm \
>+	$(wildcard $(LOCAL_PATH)/src/core/android/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/cpuinfo/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/dynapi/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/events/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/file/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/haptic/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/haptic/dummy/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/joystick/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/joystick/android/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/power/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/power/android/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/filesystem/dummy/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/render/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/render/*/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/thread/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/thread/pthread/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/timer/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/timer/unix/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/video/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/video/android/*.c))
>+
>+LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DSDL_PREFIX=org_libsdl_drummix
>+LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
>+
>+
>+include $(BUILD_SHARED_LIBRARY)
>diff -r 1b62b081a83b android/drummix/jni/src/Android.mk
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/drummix/jni/src/Android.mk	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,41 @@
>+LOCAL_PATH := $(call my-dir)
>+
>+include $(CLEAR_VARS)
>+
>+LOCAL_MODULE := main
>+
>+ifdef "$(SDL2_HOME)"
>+  SDL2_PATH := $(SDL2_HOME)
>+else
>+  SDL2_PATH := ../../../..
>+endif
>+
>+LOCAL_C_INCLUDES := $(SDL2_PATH)/include
>+
>+.PHONY: all clean
>+
>+all : post-build
>+
>+# Copy assets
>+ASSETS_PATH = assets
>+ASSETS_SRC = $(SDL2_HOME)/Xcode-iOS/Demos/data/drums
>+
>+post-build:
>+	@echo Copy assets
>+	cp $(ASSETS_SRC)/ds_brush_snare.wav $(ASSETS_PATH)
>+	cp $(ASSETS_SRC)/ds_china.wav $(ASSETS_PATH)
>+	cp $(ASSETS_SRC)/ds_kick_big_amb.wav $(ASSETS_PATH)
>+	cp $(ASSETS_SRC)/ds_loose_skin_mute.wav $(ASSETS_PATH)
>+
>+# Add your application source files here...
>+LOCAL_SRC_FILES := $(SDL2_PATH)/src/main/android/SDL_android_main.c \
>+	$(SDL2_PATH)/Xcode-iOS/Demos/src/common.c \
>+	$(SDL2_PATH)/Xcode-iOS/Demos/src/mixer.c
>+
>+LOCAL_CFLAGS += -DSDL_PREFIX=org_libsdl_drummix
>+
>+LOCAL_SHARED_LIBRARIES := SDL2
>+
>+LOCAL_LDLIBS := -lGLESv1_CM -llog
>+
>+include $(BUILD_SHARED_LIBRARY)
>diff -r 1b62b081a83b android/drummix/lint.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/drummix/lint.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,3 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<lint>
>+</lint>
>\ No newline at end of file
>diff -r 1b62b081a83b android/drummix/proguard-project.txt
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/drummix/proguard-project.txt	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,20 @@
>+# To enable ProGuard in your project, edit project.properties
>+# to define the proguard.config property as described in that file.
>+#
>+# Add project specific ProGuard rules here.
>+# By default, the flags in this file are appended to flags specified
>+# in ${sdk.dir}/tools/proguard/proguard-android.txt
>+# You can edit the include path and order by changing the ProGuard
>+# include property in project.properties.
>+#
>+# For more details, see
>+#   http://developer.android.com/guide/developing/tools/proguard.html
>+
>+# Add any project specific keep options here:
>+
>+# If your project uses WebView with JS, uncomment the following
>+# and specify the fully qualified class name to the JavaScript interface
>+# class:
>+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
>+#   public *;
>+#}
>diff -r 1b62b081a83b android/drummix/project.properties
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/drummix/project.properties	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,14 @@
>+# This file is automatically generated by Android Tools.
>+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
>+#
>+# This file must be checked in Version Control Systems.
>+#
>+# To customize properties used by the Ant build system edit
>+# "ant.properties", and override values to adapt the script to your
>+# project structure.
>+#
>+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
>+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
>+
>+# Project target.
>+target=android-16
>diff -r 1b62b081a83b android/drummix/res/drawable-hdpi/ic_launcher.png
>Binary file android/drummix/res/drawable-hdpi/ic_launcher.png has changed
>diff -r 1b62b081a83b android/drummix/res/drawable-mdpi/ic_launcher.png
>Binary file android/drummix/res/drawable-mdpi/ic_launcher.png has changed
>diff -r 1b62b081a83b android/drummix/res/drawable-xhdpi/ic_launcher.png
>Binary file android/drummix/res/drawable-xhdpi/ic_launcher.png has changed
>diff -r 1b62b081a83b android/drummix/res/drawable-xxhdpi/ic_launcher.png
>Binary file android/drummix/res/drawable-xxhdpi/ic_launcher.png has changed
>diff -r 1b62b081a83b android/drummix/res/layout/main.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/drummix/res/layout/main.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,13 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
>+    android:orientation="vertical"
>+    android:layout_width="fill_parent"
>+    android:layout_height="fill_parent"
>+    >
>+<TextView  
>+    android:layout_width="fill_parent" 
>+    android:layout_height="wrap_content" 
>+    android:text="Hello World, SDLActivity"
>+    />
>+</LinearLayout>
>+
>diff -r 1b62b081a83b android/drummix/res/values/strings.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/drummix/res/values/strings.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,4 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+<resources>
>+    <string name="app_name">Drum Mix</string>
>+</resources>
>diff -r 1b62b081a83b android/drummix/src/org/libsdl/drummix/SDLActivity.java
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/drummix/src/org/libsdl/drummix/SDLActivity.java	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,1029 @@
>+package org.libsdl.drummix;
>+
>+import java.util.ArrayList;
>+import java.util.Arrays;
>+
>+import android.app.*;
>+import android.content.*;
>+import android.view.*;
>+import android.view.inputmethod.BaseInputConnection;
>+import android.view.inputmethod.EditorInfo;
>+import android.view.inputmethod.InputConnection;
>+import android.view.inputmethod.InputMethodManager;
>+import android.widget.AbsoluteLayout;
>+import android.os.*;
>+import android.util.Log;
>+import android.graphics.*;
>+import android.media.*;
>+import android.hardware.*;
>+
>+
>+/**
>+    SDL Activity
>+*/
>+public class SDLActivity extends Activity {
>+    private static final String TAG = "SDL";
>+
>+    // Keep track of the paused state
>+    public static boolean mIsPaused = false, mIsSurfaceReady = false, mHasFocus = true;
>+    public static boolean mExitCalledFromJava;
>+
>+    // Main components
>+    protected static SDLActivity mSingleton;
>+    protected static SDLSurface mSurface;
>+    protected static View mTextEdit;
>+    protected static ViewGroup mLayout;
>+    protected static SDLJoystickHandler mJoystickHandler;
>+
>+    // This is what SDL runs in. It invokes SDL_main(), eventually
>+    protected static Thread mSDLThread;
>+    
>+    // Audio
>+    protected static Thread mAudioThread;
>+    protected static AudioTrack mAudioTrack;
>+
>+    // Load the .so
>+    static {
>+        System.loadLibrary("SDL2");
>+        //System.loadLibrary("SDL2_image");
>+        //System.loadLibrary("SDL2_mixer");
>+        //System.loadLibrary("SDL2_net");
>+        //System.loadLibrary("SDL2_ttf");
>+        System.loadLibrary("main");
>+    }
>+
>+    // Setup
>+    @Override
>+    protected void onCreate(Bundle savedInstanceState) {
>+        //Log.v("SDL", "onCreate()");
>+        super.onCreate(savedInstanceState);
>+        
>+        // So we can call stuff from static callbacks
>+        mSingleton = this;
>+
>+        // Set up the surface
>+        mSurface = new SDLSurface(getApplication());
>+        
>+        // Make sure this variable is initialized here!
>+        mExitCalledFromJava = false;
>+        
>+        if(Build.VERSION.SDK_INT >= 12) {
>+            mJoystickHandler = new SDLJoystickHandler_API12();
>+        }
>+        else {
>+            mJoystickHandler = new SDLJoystickHandler();
>+        }
>+
>+        mLayout = new AbsoluteLayout(this);
>+        mLayout.addView(mSurface);
>+
>+        setContentView(mLayout);
>+    }
>+
>+    // Events
>+    @Override
>+    protected void onPause() {
>+        Log.v("SDL", "onPause()");
>+        super.onPause();
>+        SDLActivity.handlePause();
>+    }
>+
>+    @Override
>+    protected void onResume() {
>+        Log.v("SDL", "onResume()");
>+        super.onResume();
>+        SDLActivity.handleResume();
>+    }
>+
>+
>+    @Override
>+    public void onWindowFocusChanged(boolean hasFocus) {
>+        super.onWindowFocusChanged(hasFocus);
>+        Log.v("SDL", "onWindowFocusChanged(): " + hasFocus);
>+
>+        SDLActivity.mHasFocus = hasFocus;
>+        if (hasFocus) {
>+            SDLActivity.handleResume();
>+        }
>+    }
>+
>+    @Override
>+    public void onLowMemory() {
>+        Log.v("SDL", "onLowMemory()");
>+        super.onLowMemory();
>+        SDLActivity.nativeLowMemory();
>+    }
>+
>+    @Override
>+    protected void onDestroy() {
>+        super.onDestroy();
>+        Log.v("SDL", "onDestroy()");
>+        // Send a quit message to the application
>+        SDLActivity.mExitCalledFromJava = true;
>+        SDLActivity.nativeQuit();
>+
>+        // Now wait for the SDL thread to quit
>+        if (SDLActivity.mSDLThread != null) {
>+            try {
>+                SDLActivity.mSDLThread.join();
>+            } catch(Exception e) {
>+                Log.v("SDL", "Problem stopping thread: " + e);
>+            }
>+            SDLActivity.mSDLThread = null;
>+
>+            //Log.v("SDL", "Finished waiting for SDL thread");
>+        }
>+    }
>+
>+    @Override
>+    public boolean dispatchKeyEvent(KeyEvent event) {
>+        int keyCode = event.getKeyCode();
>+        // Ignore certain special keys so they're handled by Android
>+        if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
>+            keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
>+            keyCode == KeyEvent.KEYCODE_CAMERA ||
>+            keyCode == 168 || /* API 11: KeyEvent.KEYCODE_ZOOM_IN */
>+            keyCode == 169 /* API 11: KeyEvent.KEYCODE_ZOOM_OUT */
>+            ) {
>+            return false;
>+        }
>+        return super.dispatchKeyEvent(event);
>+    }
>+
>+    /** Called by onPause or surfaceDestroyed. Even if surfaceDestroyed
>+     *  is the first to be called, mIsSurfaceReady should still be set
>+     *  to 'true' during the call to onPause (in a usual scenario).
>+     */
>+    public static void handlePause() {
>+        if (!SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady) {
>+            SDLActivity.mIsPaused = true;
>+            SDLActivity.nativePause();
>+            mSurface.enableSensor(Sensor.TYPE_ACCELEROMETER, false);
>+        }
>+    }
>+
>+    /** Called by onResume or surfaceCreated. An actual resume should be done only when the surface is ready.
>+     * Note: Some Android variants may send multiple surfaceChanged events, so we don't need to resume
>+     * every time we get one of those events, only if it comes after surfaceDestroyed
>+     */
>+    public static void handleResume() {
>+        if (SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady && SDLActivity.mHasFocus) {
>+            SDLActivity.mIsPaused = false;
>+            SDLActivity.nativeResume();
>+            mSurface.enableSensor(Sensor.TYPE_ACCELEROMETER, true);
>+        }
>+    }
>+        
>+    /* The native thread has finished */
>+    public static void handleNativeExit() {
>+        SDLActivity.mSDLThread = null;
>+        mSingleton.finish();
>+    }
>+
>+
>+    // Messages from the SDLMain thread
>+    static final int COMMAND_CHANGE_TITLE = 1;
>+    static final int COMMAND_UNUSED = 2;
>+    static final int COMMAND_TEXTEDIT_HIDE = 3;
>+
>+    protected static final int COMMAND_USER = 0x8000;
>+
>+    /**
>+     * This method is called by SDL if SDL did not handle a message itself.
>+     * This happens if a received message contains an unsupported command.
>+     * Method can be overwritten to handle Messages in a different class.
>+     * @param command the command of the message.
>+     * @param param the parameter of the message. May be null.
>+     * @return if the message was handled in overridden method.
>+     */
>+    protected boolean onUnhandledMessage(int command, Object param) {
>+        return false;
>+    }
>+
>+    /**
>+     * A Handler class for Messages from native SDL applications.
>+     * It uses current Activities as target (e.g. for the title).
>+     * static to prevent implicit references to enclosing object.
>+     */
>+    protected static class SDLCommandHandler extends Handler {
>+        @Override
>+        public void handleMessage(Message msg) {
>+            Context context = getContext();
>+            if (context == null) {
>+                Log.e(TAG, "error handling message, getContext() returned null");
>+                return;
>+            }
>+            switch (msg.arg1) {
>+            case COMMAND_CHANGE_TITLE:
>+                if (context instanceof Activity) {
>+                    ((Activity) context).setTitle((String)msg.obj);
>+                } else {
>+                    Log.e(TAG, "error handling message, getContext() returned no Activity");
>+                }
>+                break;
>+            case COMMAND_TEXTEDIT_HIDE:
>+                if (mTextEdit != null) {
>+                    mTextEdit.setVisibility(View.GONE);
>+
>+                    InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
>+                    imm.hideSoftInputFromWindow(mTextEdit.getWindowToken(), 0);
>+                }
>+                break;
>+
>+            default:
>+                if ((context instanceof SDLActivity) && !((SDLActivity) context).onUnhandledMessage(msg.arg1, msg.obj)) {
>+                    Log.e(TAG, "error handling message, command is " + msg.arg1);
>+                }
>+            }
>+        }
>+    }
>+
>+    // Handler for the messages
>+    Handler commandHandler = new SDLCommandHandler();
>+
>+    // Send a message from the SDLMain thread
>+    boolean sendCommand(int command, Object data) {
>+        Message msg = commandHandler.obtainMessage();
>+        msg.arg1 = command;
>+        msg.obj = data;
>+        return commandHandler.sendMessage(msg);
>+    }
>+
>+    // C functions we call
>+    public static native void nativeInit();
>+    public static native void nativeLowMemory();
>+    public static native void nativeQuit();
>+    public static native void nativePause();
>+    public static native void nativeResume();
>+    public static native void onNativeResize(int x, int y, int format);
>+    public static native int onNativePadDown(int device_id, int keycode);
>+    public static native int onNativePadUp(int device_id, int keycode);
>+    public static native void onNativeJoy(int device_id, int axis,
>+                                          float value);
>+    public static native void onNativeKeyDown(int keycode);
>+    public static native void onNativeKeyUp(int keycode);
>+    public static native void onNativeKeyboardFocusLost();
>+    public static native void onNativeTouch(int touchDevId, int pointerFingerId,
>+                                            int action, float x, 
>+                                            float y, float p);
>+    public static native void onNativeAccel(float x, float y, float z);
>+    public static native void onNativeSurfaceChanged();
>+    public static native void onNativeSurfaceDestroyed();
>+    public static native void nativeFlipBuffers();
>+    public static native int nativeAddJoystick(int device_id, String name, 
>+                                               int is_accelerometer, int nbuttons, 
>+                                               int naxes, int nhats, int nballs);
>+    public static native int nativeRemoveJoystick(int device_id);
>+
>+    public static void flipBuffers() {
>+        SDLActivity.nativeFlipBuffers();
>+    }
>+
>+    public static boolean setActivityTitle(String title) {
>+        // Called from SDLMain() thread and can't directly affect the view
>+        return mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title);
>+    }
>+
>+    public static boolean sendMessage(int command, int param) {
>+        return mSingleton.sendCommand(command, Integer.valueOf(param));
>+    }
>+
>+    public static Context getContext() {
>+        return mSingleton;
>+    }
>+
>+    /**
>+     * @return result of getSystemService(name) but executed on UI thread.
>+     */
>+    public Object getSystemServiceFromUiThread(final String name) {
>+        final Object lock = new Object();
>+        final Object[] results = new Object[2]; // array for writable variables
>+        synchronized (lock) {
>+            runOnUiThread(new Runnable() {
>+                @Override
>+                public void run() {
>+                    synchronized (lock) {
>+                        results[0] = getSystemService(name);
>+                        results[1] = Boolean.TRUE;
>+                        lock.notify();
>+                    }
>+                }
>+            });
>+            if (results[1] == null) {
>+                try {
>+                    lock.wait();
>+                } catch (InterruptedException ex) {
>+                    ex.printStackTrace();
>+                }
>+            }
>+        }
>+        return results[0];
>+    }
>+
>+    static class ShowTextInputTask implements Runnable {
>+        /*
>+         * This is used to regulate the pan&scan method to have some offset from
>+         * the bottom edge of the input region and the top edge of an input
>+         * method (soft keyboard)
>+         */
>+        static final int HEIGHT_PADDING = 15;
>+
>+        public int x, y, w, h;
>+
>+        public ShowTextInputTask(int x, int y, int w, int h) {
>+            this.x = x;
>+            this.y = y;
>+            this.w = w;
>+            this.h = h;
>+        }
>+
>+        @Override
>+        public void run() {
>+            AbsoluteLayout.LayoutParams params = new AbsoluteLayout.LayoutParams(
>+                    w, h + HEIGHT_PADDING, x, y);
>+
>+            if (mTextEdit == null) {
>+                mTextEdit = new DummyEdit(getContext());
>+
>+                mLayout.addView(mTextEdit, params);
>+            } else {
>+                mTextEdit.setLayoutParams(params);
>+            }
>+
>+            mTextEdit.setVisibility(View.VISIBLE);
>+            mTextEdit.requestFocus();
>+
>+            InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
>+            imm.showSoftInput(mTextEdit, 0);
>+        }
>+    }
>+
>+    public static boolean showTextInput(int x, int y, int w, int h) {
>+        // Transfer the task to the main thread as a Runnable
>+        return mSingleton.commandHandler.post(new ShowTextInputTask(x, y, w, h));
>+    }
>+            
>+    public static Surface getNativeSurface() {
>+        return SDLActivity.mSurface.getNativeSurface();
>+    }
>+
>+    // Audio
>+    public static int audioInit(int sampleRate, boolean is16Bit, boolean isStereo, int desiredFrames) {
>+        int channelConfig = isStereo ? AudioFormat.CHANNEL_CONFIGURATION_STEREO : AudioFormat.CHANNEL_CONFIGURATION_MONO;
>+        int audioFormat = is16Bit ? AudioFormat.ENCODING_PCM_16BIT : AudioFormat.ENCODING_PCM_8BIT;
>+        int frameSize = (isStereo ? 2 : 1) * (is16Bit ? 2 : 1);
>+        
>+        Log.v("SDL", "SDL audio: wanted " + (isStereo ? "stereo" : "mono") + " " + (is16Bit ? "16-bit" : "8-bit") + " " + (sampleRate / 1000f) + "kHz, " + desiredFrames + " frames buffer");
>+        
>+        // Let the user pick a larger buffer if they really want -- but ye
>+        // gods they probably shouldn't, the minimums are horrifyingly high
>+        // latency already
>+        desiredFrames = Math.max(desiredFrames, (AudioTrack.getMinBufferSize(sampleRate, channelConfig, audioFormat) + frameSize - 1) / frameSize);
>+        
>+        if (mAudioTrack == null) {
>+            mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate,
>+                    channelConfig, audioFormat, desiredFrames * frameSize, AudioTrack.MODE_STREAM);
>+            
>+            // Instantiating AudioTrack can "succeed" without an exception and the track may still be invalid
>+            // Ref: https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/media/java/android/media/AudioTrack.java
>+            // Ref: http://developer.android.com/reference/android/media/AudioTrack.html#getState()
>+            
>+            if (mAudioTrack.getState() != AudioTrack.STATE_INITIALIZED) {
>+                Log.e("SDL", "Failed during initialization of Audio Track");
>+                mAudioTrack = null;
>+                return -1;
>+            }
>+            
>+            mAudioTrack.play();
>+        }
>+       
>+        Log.v("SDL", "SDL audio: got " + ((mAudioTrack.getChannelCount() >= 2) ? "stereo" : "mono") + " " + ((mAudioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit") + " " + (mAudioTrack.getSampleRate() / 1000f) + "kHz, " + desiredFrames + " frames buffer");
>+        
>+        return 0;
>+    }
>+    
>+    public static void audioWriteShortBuffer(short[] buffer) {
>+        for (int i = 0; i < buffer.length; ) {
>+            int result = mAudioTrack.write(buffer, i, buffer.length - i);
>+            if (result > 0) {
>+                i += result;
>+            } else if (result == 0) {
>+                try {
>+                    Thread.sleep(1);
>+                } catch(InterruptedException e) {
>+                    // Nom nom
>+                }
>+            } else {
>+                Log.w("SDL", "SDL audio: error return from write(short)");
>+                return;
>+            }
>+        }
>+    }
>+    
>+    public static void audioWriteByteBuffer(byte[] buffer) {
>+        for (int i = 0; i < buffer.length; ) {
>+            int result = mAudioTrack.write(buffer, i, buffer.length - i);
>+            if (result > 0) {
>+                i += result;
>+            } else if (result == 0) {
>+                try {
>+                    Thread.sleep(1);
>+                } catch(InterruptedException e) {
>+                    // Nom nom
>+                }
>+            } else {
>+                Log.w("SDL", "SDL audio: error return from write(byte)");
>+                return;
>+            }
>+        }
>+    }
>+
>+    public static void audioQuit() {
>+        if (mAudioTrack != null) {
>+            mAudioTrack.stop();
>+            mAudioTrack = null;
>+        }
>+    }
>+
>+    // Input
>+
>+    /**
>+     * @return an array which may be empty but is never null.
>+     */
>+    public static int[] inputGetInputDeviceIds(int sources) {
>+        int[] ids = InputDevice.getDeviceIds();
>+        int[] filtered = new int[ids.length];
>+        int used = 0;
>+        for (int i = 0; i < ids.length; ++i) {
>+            InputDevice device = InputDevice.getDevice(ids[i]);
>+            if ((device != null) && ((device.getSources() & sources) != 0)) {
>+                filtered[used++] = device.getId();
>+            }
>+        }
>+        return Arrays.copyOf(filtered, used);
>+    }
>+            
>+    // Joystick glue code, just a series of stubs that redirect to the SDLJoystickHandler instance
>+    public static boolean handleJoystickMotionEvent(MotionEvent event) {
>+        return mJoystickHandler.handleMotionEvent(event);
>+    }
>+    
>+    public static void pollInputDevices() {
>+        if (SDLActivity.mSDLThread != null) {
>+            mJoystickHandler.pollInputDevices();
>+        }
>+    }
>+    
>+}
>+
>+/**
>+    Simple nativeInit() runnable
>+*/
>+class SDLMain implements Runnable {
>+    @Override
>+    public void run() {
>+        // Runs SDL_main()
>+        SDLActivity.nativeInit();
>+
>+        //Log.v("SDL", "SDL thread terminated");
>+    }
>+}
>+
>+
>+/**
>+    SDLSurface. This is what we draw on, so we need to know when it's created
>+    in order to do anything useful. 
>+
>+    Because of this, that's where we set up the SDL thread
>+*/
>+class SDLSurface extends SurfaceView implements SurfaceHolder.Callback, 
>+    View.OnKeyListener, View.OnTouchListener, SensorEventListener  {
>+
>+    // Sensors
>+    protected static SensorManager mSensorManager;
>+    protected static Display mDisplay;
>+
>+    // Keep track of the surface size to normalize touch events
>+    protected static float mWidth, mHeight;
>+
>+    // Startup    
>+    public SDLSurface(Context context) {
>+        super(context);
>+        getHolder().addCallback(this); 
>+    
>+        setFocusable(true);
>+        setFocusableInTouchMode(true);
>+        requestFocus();
>+        setOnKeyListener(this); 
>+        setOnTouchListener(this);   
>+
>+        mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
>+        mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
>+        
>+        if(Build.VERSION.SDK_INT >= 12) {
>+            setOnGenericMotionListener(new SDLGenericMotionListener_API12());
>+        }
>+
>+        // Some arbitrary defaults to avoid a potential division by zero
>+        mWidth = 1.0f;
>+        mHeight = 1.0f;
>+    }
>+    
>+    public Surface getNativeSurface() {
>+        return getHolder().getSurface();
>+    }
>+
>+    // Called when we have a valid drawing surface
>+    @Override
>+    public void surfaceCreated(SurfaceHolder holder) {
>+        Log.v("SDL", "surfaceCreated()");
>+        holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
>+    }
>+
>+    // Called when we lose the surface
>+    @Override
>+    public void surfaceDestroyed(SurfaceHolder holder) {
>+        Log.v("SDL", "surfaceDestroyed()");
>+        // Call this *before* setting mIsSurfaceReady to 'false'
>+        SDLActivity.handlePause();
>+        SDLActivity.mIsSurfaceReady = false;
>+        SDLActivity.onNativeSurfaceDestroyed();
>+    }
>+
>+    // Called when the surface is resized
>+    @Override
>+    public void surfaceChanged(SurfaceHolder holder,
>+                               int format, int width, int height) {
>+        Log.v("SDL", "surfaceChanged()");
>+
>+        int sdlFormat = 0x15151002; // SDL_PIXELFORMAT_RGB565 by default
>+        switch (format) {
>+        case PixelFormat.A_8:
>+            Log.v("SDL", "pixel format A_8");
>+            break;
>+        case PixelFormat.LA_88:
>+            Log.v("SDL", "pixel format LA_88");
>+            break;
>+        case PixelFormat.L_8:
>+            Log.v("SDL", "pixel format L_8");
>+            break;
>+        case PixelFormat.RGBA_4444:
>+            Log.v("SDL", "pixel format RGBA_4444");
>+            sdlFormat = 0x15421002; // SDL_PIXELFORMAT_RGBA4444
>+            break;
>+        case PixelFormat.RGBA_5551:
>+            Log.v("SDL", "pixel format RGBA_5551");
>+            sdlFormat = 0x15441002; // SDL_PIXELFORMAT_RGBA5551
>+            break;
>+        case PixelFormat.RGBA_8888:
>+            Log.v("SDL", "pixel format RGBA_8888");
>+            sdlFormat = 0x16462004; // SDL_PIXELFORMAT_RGBA8888
>+            break;
>+        case PixelFormat.RGBX_8888:
>+            Log.v("SDL", "pixel format RGBX_8888");
>+            sdlFormat = 0x16261804; // SDL_PIXELFORMAT_RGBX8888
>+            break;
>+        case PixelFormat.RGB_332:
>+            Log.v("SDL", "pixel format RGB_332");
>+            sdlFormat = 0x14110801; // SDL_PIXELFORMAT_RGB332
>+            break;
>+        case PixelFormat.RGB_565:
>+            Log.v("SDL", "pixel format RGB_565");
>+            sdlFormat = 0x15151002; // SDL_PIXELFORMAT_RGB565
>+            break;
>+        case PixelFormat.RGB_888:
>+            Log.v("SDL", "pixel format RGB_888");
>+            // Not sure this is right, maybe SDL_PIXELFORMAT_RGB24 instead?
>+            sdlFormat = 0x16161804; // SDL_PIXELFORMAT_RGB888
>+            break;
>+        default:
>+            Log.v("SDL", "pixel format unknown " + format);
>+            break;
>+        }
>+
>+        mWidth = width;
>+        mHeight = height;
>+        SDLActivity.onNativeResize(width, height, sdlFormat);
>+        Log.v("SDL", "Window size:" + width + "x"+height);
>+
>+        // Set mIsSurfaceReady to 'true' *before* making a call to handleResume
>+        SDLActivity.mIsSurfaceReady = true;
>+        SDLActivity.onNativeSurfaceChanged();
>+
>+
>+        if (SDLActivity.mSDLThread == null) {
>+            // This is the entry point to the C app.
>+            // Start up the C app thread and enable sensor input for the first time
>+
>+            SDLActivity.mSDLThread = new Thread(new SDLMain(), "SDLThread");
>+            enableSensor(Sensor.TYPE_ACCELEROMETER, true);
>+            SDLActivity.mSDLThread.start();
>+            
>+            // Set up a listener thread to catch when the native thread ends
>+            new Thread(new Runnable(){
>+                @Override
>+                public void run(){
>+                    try {
>+                        SDLActivity.mSDLThread.join();
>+                    }
>+                    catch(Exception e){}
>+                    finally{ 
>+                        // Native thread has finished
>+                        if (! SDLActivity.mExitCalledFromJava) {
>+                            SDLActivity.handleNativeExit();
>+                        }
>+                    }
>+                }
>+            }).start();
>+        }
>+    }
>+
>+    // unused
>+    @Override
>+    public void onDraw(Canvas canvas) {}
>+
>+
>+    // Key events
>+    @Override
>+    public boolean onKey(View  v, int keyCode, KeyEvent event) {
>+        // Dispatch the different events depending on where they come from
>+        // Some SOURCE_DPAD or SOURCE_GAMEPAD are also SOURCE_KEYBOARD
>+        // So, we try to process them as DPAD or GAMEPAD events first, if that fails we try them as KEYBOARD
>+        
>+        if ( (event.getSource() & 0x00000401) != 0 || /* API 12: SOURCE_GAMEPAD */
>+                   (event.getSource() & InputDevice.SOURCE_DPAD) != 0 ) {
>+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+                if (SDLActivity.onNativePadDown(event.getDeviceId(), keyCode) == 0) {
>+                    return true;
>+                }
>+            } else if (event.getAction() == KeyEvent.ACTION_UP) {
>+                if (SDLActivity.onNativePadUp(event.getDeviceId(), keyCode) == 0) {
>+                    return true;
>+                }
>+            }
>+        }
>+        
>+        if( (event.getSource() & InputDevice.SOURCE_KEYBOARD) != 0) {
>+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+                //Log.v("SDL", "key down: " + keyCode);
>+                SDLActivity.onNativeKeyDown(keyCode);
>+                return true;
>+            }
>+            else if (event.getAction() == KeyEvent.ACTION_UP) {
>+                //Log.v("SDL", "key up: " + keyCode);
>+                SDLActivity.onNativeKeyUp(keyCode);
>+                return true;
>+            }
>+        }
>+        
>+        return false;
>+    }
>+
>+    // Touch events
>+    @Override
>+    public boolean onTouch(View v, MotionEvent event) {
>+        /* Ref: http://developer.android.com/training/gestures/multi.html */
>+        final int touchDevId = event.getDeviceId();
>+        final int pointerCount = event.getPointerCount();
>+        int action = event.getActionMasked();
>+        int pointerFingerId;
>+        int i = -1;
>+        float x,y,p;
>+        
>+        switch(action) {
>+            case MotionEvent.ACTION_MOVE:
>+                for (i = 0; i < pointerCount; i++) {
>+                    pointerFingerId = event.getPointerId(i);
>+                    x = event.getX(i) / mWidth;
>+                    y = event.getY(i) / mHeight;
>+                    p = event.getPressure(i);
>+                    SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
>+                }
>+                break;
>+            
>+            case MotionEvent.ACTION_UP:
>+            case MotionEvent.ACTION_DOWN:
>+                // Primary pointer up/down, the index is always zero
>+                i = 0;
>+            case MotionEvent.ACTION_POINTER_UP:
>+            case MotionEvent.ACTION_POINTER_DOWN:
>+                // Non primary pointer up/down
>+                if (i == -1) {
>+                    i = event.getActionIndex();
>+                }
>+                
>+                pointerFingerId = event.getPointerId(i);
>+                x = event.getX(i) / mWidth;
>+                y = event.getY(i) / mHeight;
>+                p = event.getPressure(i);
>+                SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
>+                break;
>+            
>+            default:
>+                break;
>+        }
>+
>+        return true;
>+   } 
>+
>+    // Sensor events
>+    public void enableSensor(int sensortype, boolean enabled) {
>+        // TODO: This uses getDefaultSensor - what if we have >1 accels?
>+        if (enabled) {
>+            mSensorManager.registerListener(this, 
>+                            mSensorManager.getDefaultSensor(sensortype), 
>+                            SensorManager.SENSOR_DELAY_GAME, null);
>+        } else {
>+            mSensorManager.unregisterListener(this, 
>+                            mSensorManager.getDefaultSensor(sensortype));
>+        }
>+    }
>+    
>+    @Override
>+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
>+        // TODO
>+    }
>+
>+    @Override
>+    public void onSensorChanged(SensorEvent event) {
>+        if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
>+            float x, y;
>+            switch (mDisplay.getRotation()) {
>+                case Surface.ROTATION_90:
>+                    x = -event.values[1];
>+                    y = event.values[0];
>+                    break;
>+                case Surface.ROTATION_270:
>+                    x = event.values[1];
>+                    y = -event.values[0];
>+                    break;
>+                case Surface.ROTATION_180:
>+                    x = -event.values[1];
>+                    y = -event.values[0];
>+                    break;
>+                default:
>+                    x = event.values[0];
>+                    y = event.values[1];
>+                    break;
>+            }
>+            SDLActivity.onNativeAccel(-x / SensorManager.GRAVITY_EARTH,
>+                                      y / SensorManager.GRAVITY_EARTH,
>+                                      event.values[2] / SensorManager.GRAVITY_EARTH - 1);
>+        }
>+    }    
>+}
>+
>+/* This is a fake invisible editor view that receives the input and defines the
>+ * pan&scan region
>+ */
>+class DummyEdit extends View implements View.OnKeyListener {
>+    InputConnection ic;
>+
>+    public DummyEdit(Context context) {
>+        super(context);
>+        setFocusableInTouchMode(true);
>+        setFocusable(true);
>+        setOnKeyListener(this);
>+    }
>+
>+    @Override
>+    public boolean onCheckIsTextEditor() {
>+        return true;
>+    }
>+
>+    @Override
>+    public boolean onKey(View v, int keyCode, KeyEvent event) {
>+
>+        // This handles the hardware keyboard input
>+        if (event.isPrintingKey()) {
>+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+                ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1);
>+            }
>+            return true;
>+        }
>+
>+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+            SDLActivity.onNativeKeyDown(keyCode);
>+            return true;
>+        } else if (event.getAction() == KeyEvent.ACTION_UP) {
>+            SDLActivity.onNativeKeyUp(keyCode);
>+            return true;
>+        }
>+
>+        return false;
>+    }
>+        
>+    //
>+    @Override
>+    public boolean onKeyPreIme (int keyCode, KeyEvent event) {
>+        // As seen on StackOverflow: http://stackoverflow.com/questions/7634346/keyboard-hide-event
>+        // FIXME: Discussion at http://bugzilla.libsdl.org/show_bug.cgi?id=1639
>+        // FIXME: This is not a 100% effective solution to the problem of detecting if the keyboard is showing or not
>+        // FIXME: A more effective solution would be to change our Layout from AbsoluteLayout to Relative or Linear
>+        // FIXME: And determine the keyboard presence doing this: http://stackoverflow.com/questions/2150078/how-to-check-visibility-of-software-keyboard-in-android
>+        // FIXME: An even more effective way would be if Android provided this out of the box, but where would the fun be in that :)
>+        if (event.getAction()==KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
>+            if (SDLActivity.mTextEdit != null && SDLActivity.mTextEdit.getVisibility() == View.VISIBLE) {
>+                SDLActivity.onNativeKeyboardFocusLost();
>+            }
>+        }
>+        return super.onKeyPreIme(keyCode, event);
>+    }
>+
>+    @Override
>+    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
>+        ic = new SDLInputConnection(this, true);
>+
>+        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
>+                | 33554432 /* API 11: EditorInfo.IME_FLAG_NO_FULLSCREEN */;
>+
>+        return ic;
>+    }
>+}
>+
>+class SDLInputConnection extends BaseInputConnection {
>+
>+    public SDLInputConnection(View targetView, boolean fullEditor) {
>+        super(targetView, fullEditor);
>+
>+    }
>+
>+    @Override
>+    public boolean sendKeyEvent(KeyEvent event) {
>+
>+        /*
>+         * This handles the keycodes from soft keyboard (and IME-translated
>+         * input from hardkeyboard)
>+         */
>+        int keyCode = event.getKeyCode();
>+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+            if (event.isPrintingKey()) {
>+                commitText(String.valueOf((char) event.getUnicodeChar()), 1);
>+            }
>+            SDLActivity.onNativeKeyDown(keyCode);
>+            return true;
>+        } else if (event.getAction() == KeyEvent.ACTION_UP) {
>+
>+            SDLActivity.onNativeKeyUp(keyCode);
>+            return true;
>+        }
>+        return super.sendKeyEvent(event);
>+    }
>+
>+    @Override
>+    public boolean commitText(CharSequence text, int newCursorPosition) {
>+
>+        nativeCommitText(text.toString(), newCursorPosition);
>+
>+        return super.commitText(text, newCursorPosition);
>+    }
>+
>+    @Override
>+    public boolean setComposingText(CharSequence text, int newCursorPosition) {
>+
>+        nativeSetComposingText(text.toString(), newCursorPosition);
>+
>+        return super.setComposingText(text, newCursorPosition);
>+    }
>+
>+    public native void nativeCommitText(String text, int newCursorPosition);
>+
>+    public native void nativeSetComposingText(String text, int newCursorPosition);
>+
>+    @Override
>+    public boolean deleteSurroundingText(int beforeLength, int afterLength) {       
>+        // Workaround to capture backspace key. Ref: http://stackoverflow.com/questions/14560344/android-backspace-in-webview-baseinputconnection
>+        if (beforeLength == 1 && afterLength == 0) {
>+            // backspace
>+            return super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL))
>+                && super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL));
>+        }
>+
>+        return super.deleteSurroundingText(beforeLength, afterLength);
>+    }
>+}
>+
>+/* A null joystick handler for API level < 12 devices (the accelerometer is handled separately) */
>+class SDLJoystickHandler {
>+    
>+    public boolean handleMotionEvent(MotionEvent event) {
>+        return false;
>+    }
>+    
>+    public void pollInputDevices() {
>+    }
>+}
>+
>+/* Actual joystick functionality available for API >= 12 devices */
>+class SDLJoystickHandler_API12 extends SDLJoystickHandler {
>+  
>+    class SDLJoystick {
>+        public int device_id;
>+        public String name;
>+        public ArrayList<InputDevice.MotionRange> axes;
>+    }
>+    
>+    private ArrayList<SDLJoystick> mJoysticks;
>+    
>+    public SDLJoystickHandler_API12() {
>+       
>+        mJoysticks = new ArrayList<SDLJoystick>();
>+    }
>+
>+    @Override
>+    public void pollInputDevices() {
>+        int[] deviceIds = InputDevice.getDeviceIds();
>+        // It helps processing the device ids in reverse order
>+        // For example, in the case of the XBox 360 wireless dongle,
>+        // so the first controller seen by SDL matches what the receiver
>+        // considers to be the first controller
>+        
>+        for(int i=deviceIds.length-1; i>-1; i--) {
>+            SDLJoystick joystick = getJoystick(deviceIds[i]);
>+            if (joystick == null) {
>+                joystick = new SDLJoystick();
>+                InputDevice joystickDevice = InputDevice.getDevice(deviceIds[i]);
>+                if( (joystickDevice.getSources() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
>+                    joystick.device_id = deviceIds[i];
>+                    joystick.name = joystickDevice.getName();
>+                    joystick.axes = new ArrayList<InputDevice.MotionRange>();
>+                    
>+                    for (InputDevice.MotionRange range : joystickDevice.getMotionRanges()) {
>+                         if ( (range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
>+                            joystick.axes.add(range);
>+                         }
>+                    }
>+                    
>+                    mJoysticks.add(joystick);
>+                    SDLActivity.nativeAddJoystick(joystick.device_id, joystick.name, 0, -1, joystick.axes.size(), 0, 0);
>+                }
>+            }
>+        }
>+        
>+        /* Check removed devices */
>+        ArrayList<Integer> removedDevices = new ArrayList<Integer>();
>+        for(int i=0; i < mJoysticks.size(); i++) {
>+            int device_id = mJoysticks.get(i).device_id;
>+            int j;
>+            for (j=0; j < deviceIds.length; j++) {
>+                if (device_id == deviceIds[j]) break;
>+            }
>+            if (j == deviceIds.length) {
>+                removedDevices.add(device_id);
>+            }
>+        }
>+            
>+        for(int i=0; i < removedDevices.size(); i++) {
>+            int device_id = removedDevices.get(i);
>+            SDLActivity.nativeRemoveJoystick(device_id);
>+            for (int j=0; j < mJoysticks.size(); j++) {
>+                if (mJoysticks.get(j).device_id == device_id) {
>+                    mJoysticks.remove(j);
>+                    break;
>+                }
>+            }
>+        }        
>+    }
>+    
>+    protected SDLJoystick getJoystick(int device_id) {
>+        for(int i=0; i < mJoysticks.size(); i++) {
>+            if (mJoysticks.get(i).device_id == device_id) {
>+                return mJoysticks.get(i);
>+            }
>+        }
>+        return null;
>+    }   
>+    
>+    @Override        
>+    public boolean handleMotionEvent(MotionEvent event) {
>+        if ( (event.getSource() & InputDevice.SOURCE_JOYSTICK) != 0) {
>+            int actionPointerIndex = event.getActionIndex();
>+            int action = event.getActionMasked();
>+            switch(action) {
>+                case MotionEvent.ACTION_MOVE:
>+                    SDLJoystick joystick = getJoystick(event.getDeviceId());
>+                    if ( joystick != null ) {
>+                        for (int i = 0; i < joystick.axes.size(); i++) {
>+                            InputDevice.MotionRange range = joystick.axes.get(i);
>+                            /* Normalize the value to -1...1 */
>+                            float value = ( event.getAxisValue( range.getAxis(), actionPointerIndex) - range.getMin() ) / range.getRange() * 2.0f - 1.0f;
>+                            SDLActivity.onNativeJoy(joystick.device_id, i, value );
>+                        }                       
>+                    }
>+                    break;
>+                default:
>+                    break;
>+            }
>+        }
>+        return true;
>+    }            
>+}
>+
>+class SDLGenericMotionListener_API12 implements View.OnGenericMotionListener {
>+    // Generic Motion (mouse hover, joystick...) events go here
>+    // We only have joysticks yet
>+    @Override
>+    public boolean onGenericMotion(View v, MotionEvent event) {
>+        return SDLActivity.handleJoystickMotionEvent(event);
>+    }
>+}
>diff -r 1b62b081a83b android/fireworks/.classpath
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/fireworks/.classpath	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,9 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<classpath>
>+	<classpathentry kind="src" path="src"/>
>+	<classpathentry kind="src" path="gen"/>
>+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
>+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
>+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
>+	<classpathentry kind="output" path="bin/classes"/>
>+</classpath>
>diff -r 1b62b081a83b android/fireworks/.project
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/fireworks/.project	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,33 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<projectDescription>
>+	<name>fireworks</name>
>+	<comment></comment>
>+	<projects>
>+	</projects>
>+	<buildSpec>
>+		<buildCommand>
>+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>org.eclipse.jdt.core.javabuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+	</buildSpec>
>+	<natures>
>+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
>+		<nature>org.eclipse.jdt.core.javanature</nature>
>+	</natures>
>+</projectDescription>
>diff -r 1b62b081a83b android/fireworks/.settings/org.eclipse.ltk.core.refactoring.prefs
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/fireworks/.settings/org.eclipse.ltk.core.refactoring.prefs	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,2 @@
>+eclipse.preferences.version=1
>+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
>diff -r 1b62b081a83b android/fireworks/AndroidManifest.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/fireworks/AndroidManifest.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,42 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+
>+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
>+      package="org.libsdl.fireworks"
>+      android:versionCode="1"
>+      android:versionName="1.0"
>+      android:installLocation="auto">
>+
>+    
>+    <application android:label="@string/app_name"
>+                 android:icon="@drawable/ic_launcher"
>+                 android:allowBackup="true"
>+                 android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
>+        <activity android:name="SDLActivity"
>+                  android:label="@string/app_name">
>+            <intent-filter>
>+                <action android:name="android.intent.action.MAIN" />
>+                <category android:name="android.intent.category.LAUNCHER" />
>+            </intent-filter>
>+        </activity>
>+            
>+    </application>
>+
>+    
>+    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
>+
>+    
>+    <uses-feature android:glEsVersion="0x00020000" /> 
>+
>+    
>+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 
>+</manifest> 
>diff -r 1b62b081a83b android/fireworks/ant.properties
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/fireworks/ant.properties	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,17 @@
>+# This file is used to override default values used by the Ant build system.
>+#
>+# This file must be checked into Version Control Systems, as it is
>+# integral to the build system of your project.
>+
>+# This file is only used by the Ant script.
>+
>+# You can use this to override default values such as
>+#  'source.dir' for the location of your java source folder and
>+#  'out.dir' for the location of your output folder.
>+
>+# You can also use it define how the release builds are signed by declaring
>+# the following properties:
>+#  'key.store' for the location of your keystore and
>+#  'key.alias' for the name of the key to use.
>+# The password will be asked during the build when you use the 'release' target.
>+
>diff -r 1b62b081a83b android/fireworks/build.properties
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/fireworks/build.properties	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,17 @@
>+# This file is used to override default values used by the Ant build system.
>+# 
>+# This file must be checked in Version Control Systems, as it is
>+# integral to the build system of your project.
>+
>+# This file is only used by the Ant script.
>+
>+# You can use this to override default values such as
>+#  'source.dir' for the location of your java source folder and
>+#  'out.dir' for the location of your output folder.
>+
>+# You can also use it define how the release builds are signed by declaring
>+# the following properties:
>+#  'key.store' for the location of your keystore and
>+#  'key.alias' for the name of the key to use.
>+# The password will be asked during the build when you use the 'release' target.
>+
>diff -r 1b62b081a83b android/fireworks/build.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/fireworks/build.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,93 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+
>+<project name="Fireworks" default="help">
>+
>+    
>+    <property file="local.properties" />
>+
>+    
>+    <property file="ant.properties" />
>+
>+    
>+    <property environment="env" />
>+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
>+        <isset property="env.ANDROID_HOME" />
>+    </condition>
>+
>+    
>+    <loadproperties srcFile="project.properties" />
>+
>+    
>+    <fail
>+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
>+            unless="sdk.dir"
>+    />
>+
>+    
>+    <import file="custom_rules.xml" optional="true" />
>+
>+    
>+    
>+    <import file="${sdk.dir}/tools/ant/build.xml" />
>+
>+</project>
>diff -r 1b62b081a83b android/fireworks/clean.sh
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/fireworks/clean.sh	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,5 @@
>+rm -rf bin
>+rm -rf gen
>+rm -rf obj
>+rm -rf libs
>+rm -f assets/*.bmp
>diff -r 1b62b081a83b android/fireworks/default.properties
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/fireworks/default.properties	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,11 @@
>+# This file is automatically generated by Android Tools.
>+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
>+# 
>+# This file must be checked in Version Control Systems.
>+# 
>+# To customize properties used by the Ant build system use,
>+# "build.properties", and override values to adapt the script to your
>+# project structure.
>+
>+# Project target.
>+target=android-7
>diff -r 1b62b081a83b android/fireworks/jni/Android.mk
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/fireworks/jni/Android.mk	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,1 @@
>+include $(call all-subdir-makefiles)
>diff -r 1b62b081a83b android/fireworks/jni/Application.mk
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/fireworks/jni/Application.mk	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,6 @@
>+APP_ABI := armeabi x86
>+APP_PLATFORM := android-9
>+
>+# Uncomment this if you're using STL in your project
>+# See CPLUSPLUS-SUPPORT.html in the NDK documentation for more information
>+# APP_STL := stlport_static 
>diff -r 1b62b081a83b android/fireworks/jni/SDL/Android.mk
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/fireworks/jni/SDL/Android.mk	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,52 @@
>+LOCAL_PATH := $(SDL2_HOME)
>+
>+###########################
>+#
>+# SDL shared library
>+#
>+###########################
>+
>+include $(CLEAR_VARS)
>+
>+LOCAL_MODULE := SDL2
>+
>+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
>+
>+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
>+
>+LOCAL_SRC_FILES := \
>+	$(subst $(LOCAL_PATH)/,, \
>+	$(wildcard $(LOCAL_PATH)/src/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/audio/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/audio/android/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/audio/dummy/*.c) \
>+	$(LOCAL_PATH)/src/atomic/SDL_atomic.c \
>+	$(LOCAL_PATH)/src/atomic/SDL_spinlock.c.arm \
>+	$(wildcard $(LOCAL_PATH)/src/core/android/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/cpuinfo/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/dynapi/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/events/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/file/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/haptic/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/haptic/dummy/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/joystick/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/joystick/android/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/power/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/power/android/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/filesystem/dummy/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/render/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/render/*/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/thread/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/thread/pthread/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/timer/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/timer/unix/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/video/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/video/android/*.c))
>+
>+LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DSDL_PREFIX=org_libsdl_fireworks
>+LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
>+
>+
>+include $(BUILD_SHARED_LIBRARY)
>diff -r 1b62b081a83b android/fireworks/jni/src/Android.mk
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/fireworks/jni/src/Android.mk	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,38 @@
>+LOCAL_PATH := $(call my-dir)
>+
>+include $(CLEAR_VARS)
>+
>+LOCAL_MODULE := main
>+
>+ifdef "$(SDL2_HOME)"
>+  SDL2_PATH := $(SDL2_HOME)
>+else
>+  SDL2_PATH := ../../../..
>+endif
>+
>+LOCAL_C_INCLUDES := $(SDL_PATH)/include
>+
>+.PHONY: all clean
>+
>+all : post-build
>+
>+# Copy assets
>+ASSETS_PATH = assets
>+ASSETS_SRC = ../../Xcode-iOS/Demos/data
>+
>+post-build:
>+	@echo Copy assets
>+	cp $(ASSETS_SRC)/stroke.bmp $(ASSETS_PATH)
>+
>+# Add your application source files here...
>+LOCAL_SRC_FILES := $(SDL2_PATH)/src/main/android/SDL_android_main.c \
>+	$(SDL2_PATH)/Xcode-iOS/Demos/src/fireworks.c \
>+	$(SDL2_PATH)/Xcode-iOS/Demos/src/common.c
>+
>+LOCAL_CFLAGS += -DSDL_PREFIX=org_libsdl_fireworks
>+
>+LOCAL_SHARED_LIBRARIES := SDL2
>+
>+LOCAL_LDLIBS := -lGLESv1_CM -llog
>+
>+include $(BUILD_SHARED_LIBRARY)
>diff -r 1b62b081a83b android/fireworks/lint.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/fireworks/lint.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,3 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<lint>
>+</lint>
>\ No newline at end of file
>diff -r 1b62b081a83b android/fireworks/proguard-project.txt
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/fireworks/proguard-project.txt	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,20 @@
>+# To enable ProGuard in your project, edit project.properties
>+# to define the proguard.config property as described in that file.
>+#
>+# Add project specific ProGuard rules here.
>+# By default, the flags in this file are appended to flags specified
>+# in ${sdk.dir}/tools/proguard/proguard-android.txt
>+# You can edit the include path and order by changing the ProGuard
>+# include property in project.properties.
>+#
>+# For more details, see
>+#   http://developer.android.com/guide/developing/tools/proguard.html
>+
>+# Add any project specific keep options here:
>+
>+# If your project uses WebView with JS, uncomment the following
>+# and specify the fully qualified class name to the JavaScript interface
>+# class:
>+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
>+#   public *;
>+#}
>diff -r 1b62b081a83b android/fireworks/project.properties
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/fireworks/project.properties	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,14 @@
>+# This file is automatically generated by Android Tools.
>+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
>+#
>+# This file must be checked in Version Control Systems.
>+#
>+# To customize properties used by the Ant build system edit
>+# "ant.properties", and override values to adapt the script to your
>+# project structure.
>+#
>+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
>+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
>+
>+# Project target.
>+target=android-16
>diff -r 1b62b081a83b android/fireworks/res/drawable-hdpi/ic_launcher.png
>Binary file android/fireworks/res/drawable-hdpi/ic_launcher.png has changed
>diff -r 1b62b081a83b android/fireworks/res/drawable-mdpi/ic_launcher.png
>Binary file android/fireworks/res/drawable-mdpi/ic_launcher.png has changed
>diff -r 1b62b081a83b android/fireworks/res/drawable-xhdpi/ic_launcher.png
>Binary file android/fireworks/res/drawable-xhdpi/ic_launcher.png has changed
>diff -r 1b62b081a83b android/fireworks/res/drawable-xxhdpi/ic_launcher.png
>Binary file android/fireworks/res/drawable-xxhdpi/ic_launcher.png has changed
>diff -r 1b62b081a83b android/fireworks/res/layout/main.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/fireworks/res/layout/main.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,13 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
>+    android:orientation="vertical"
>+    android:layout_width="fill_parent"
>+    android:layout_height="fill_parent"
>+    >
>+<TextView  
>+    android:layout_width="fill_parent" 
>+    android:layout_height="wrap_content" 
>+    android:text="Hello World, SDLActivity"
>+    />
>+</LinearLayout>
>+
>diff -r 1b62b081a83b android/fireworks/res/values/strings.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/fireworks/res/values/strings.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,4 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+<resources>
>+    <string name="app_name">Fireworks</string>
>+</resources>
>diff -r 1b62b081a83b android/fireworks/src/org/libsdl/fireworks/SDLActivity.java
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/fireworks/src/org/libsdl/fireworks/SDLActivity.java	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,1029 @@
>+package org.libsdl.fireworks;
>+
>+import java.util.ArrayList;
>+import java.util.Arrays;
>+
>+import android.app.*;
>+import android.content.*;
>+import android.view.*;
>+import android.view.inputmethod.BaseInputConnection;
>+import android.view.inputmethod.EditorInfo;
>+import android.view.inputmethod.InputConnection;
>+import android.view.inputmethod.InputMethodManager;
>+import android.widget.AbsoluteLayout;
>+import android.os.*;
>+import android.util.Log;
>+import android.graphics.*;
>+import android.media.*;
>+import android.hardware.*;
>+
>+
>+/**
>+    SDL Activity
>+*/
>+public class SDLActivity extends Activity {
>+    private static final String TAG = "SDL";
>+
>+    // Keep track of the paused state
>+    public static boolean mIsPaused = false, mIsSurfaceReady = false, mHasFocus = true;
>+    public static boolean mExitCalledFromJava;
>+
>+    // Main components
>+    protected static SDLActivity mSingleton;
>+    protected static SDLSurface mSurface;
>+    protected static View mTextEdit;
>+    protected static ViewGroup mLayout;
>+    protected static SDLJoystickHandler mJoystickHandler;
>+
>+    // This is what SDL runs in. It invokes SDL_main(), eventually
>+    protected static Thread mSDLThread;
>+    
>+    // Audio
>+    protected static Thread mAudioThread;
>+    protected static AudioTrack mAudioTrack;
>+
>+    // Load the .so
>+    static {
>+        System.loadLibrary("SDL2");
>+        //System.loadLibrary("SDL2_image");
>+        //System.loadLibrary("SDL2_mixer");
>+        //System.loadLibrary("SDL2_net");
>+        //System.loadLibrary("SDL2_ttf");
>+        System.loadLibrary("main");
>+    }
>+
>+    // Setup
>+    @Override
>+    protected void onCreate(Bundle savedInstanceState) {
>+        //Log.v("SDL", "onCreate()");
>+        super.onCreate(savedInstanceState);
>+        
>+        // So we can call stuff from static callbacks
>+        mSingleton = this;
>+
>+        // Set up the surface
>+        mSurface = new SDLSurface(getApplication());
>+        
>+        // Make sure this variable is initialized here!
>+        mExitCalledFromJava = false;
>+        
>+        if(Build.VERSION.SDK_INT >= 12) {
>+            mJoystickHandler = new SDLJoystickHandler_API12();
>+        }
>+        else {
>+            mJoystickHandler = new SDLJoystickHandler();
>+        }
>+
>+        mLayout = new AbsoluteLayout(this);
>+        mLayout.addView(mSurface);
>+
>+        setContentView(mLayout);
>+    }
>+
>+    // Events
>+    @Override
>+    protected void onPause() {
>+        Log.v("SDL", "onPause()");
>+        super.onPause();
>+        SDLActivity.handlePause();
>+    }
>+
>+    @Override
>+    protected void onResume() {
>+        Log.v("SDL", "onResume()");
>+        super.onResume();
>+        SDLActivity.handleResume();
>+    }
>+
>+
>+    @Override
>+    public void onWindowFocusChanged(boolean hasFocus) {
>+        super.onWindowFocusChanged(hasFocus);
>+        Log.v("SDL", "onWindowFocusChanged(): " + hasFocus);
>+
>+        SDLActivity.mHasFocus = hasFocus;
>+        if (hasFocus) {
>+            SDLActivity.handleResume();
>+        }
>+    }
>+
>+    @Override
>+    public void onLowMemory() {
>+        Log.v("SDL", "onLowMemory()");
>+        super.onLowMemory();
>+        SDLActivity.nativeLowMemory();
>+    }
>+
>+    @Override
>+    protected void onDestroy() {
>+        super.onDestroy();
>+        Log.v("SDL", "onDestroy()");
>+        // Send a quit message to the application
>+        SDLActivity.mExitCalledFromJava = true;
>+        SDLActivity.nativeQuit();
>+
>+        // Now wait for the SDL thread to quit
>+        if (SDLActivity.mSDLThread != null) {
>+            try {
>+                SDLActivity.mSDLThread.join();
>+            } catch(Exception e) {
>+                Log.v("SDL", "Problem stopping thread: " + e);
>+            }
>+            SDLActivity.mSDLThread = null;
>+
>+            //Log.v("SDL", "Finished waiting for SDL thread");
>+        }
>+    }
>+
>+    @Override
>+    public boolean dispatchKeyEvent(KeyEvent event) {
>+        int keyCode = event.getKeyCode();
>+        // Ignore certain special keys so they're handled by Android
>+        if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
>+            keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
>+            keyCode == KeyEvent.KEYCODE_CAMERA ||
>+            keyCode == 168 || /* API 11: KeyEvent.KEYCODE_ZOOM_IN */
>+            keyCode == 169 /* API 11: KeyEvent.KEYCODE_ZOOM_OUT */
>+            ) {
>+            return false;
>+        }
>+        return super.dispatchKeyEvent(event);
>+    }
>+
>+    /** Called by onPause or surfaceDestroyed. Even if surfaceDestroyed
>+     *  is the first to be called, mIsSurfaceReady should still be set
>+     *  to 'true' during the call to onPause (in a usual scenario).
>+     */
>+    public static void handlePause() {
>+        if (!SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady) {
>+            SDLActivity.mIsPaused = true;
>+            SDLActivity.nativePause();
>+            mSurface.enableSensor(Sensor.TYPE_ACCELEROMETER, false);
>+        }
>+    }
>+
>+    /** Called by onResume or surfaceCreated. An actual resume should be done only when the surface is ready.
>+     * Note: Some Android variants may send multiple surfaceChanged events, so we don't need to resume
>+     * every time we get one of those events, only if it comes after surfaceDestroyed
>+     */
>+    public static void handleResume() {
>+        if (SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady && SDLActivity.mHasFocus) {
>+            SDLActivity.mIsPaused = false;
>+            SDLActivity.nativeResume();
>+            mSurface.enableSensor(Sensor.TYPE_ACCELEROMETER, true);
>+        }
>+    }
>+        
>+    /* The native thread has finished */
>+    public static void handleNativeExit() {
>+        SDLActivity.mSDLThread = null;
>+        mSingleton.finish();
>+    }
>+
>+
>+    // Messages from the SDLMain thread
>+    static final int COMMAND_CHANGE_TITLE = 1;
>+    static final int COMMAND_UNUSED = 2;
>+    static final int COMMAND_TEXTEDIT_HIDE = 3;
>+
>+    protected static final int COMMAND_USER = 0x8000;
>+
>+    /**
>+     * This method is called by SDL if SDL did not handle a message itself.
>+     * This happens if a received message contains an unsupported command.
>+     * Method can be overwritten to handle Messages in a different class.
>+     * @param command the command of the message.
>+     * @param param the parameter of the message. May be null.
>+     * @return if the message was handled in overridden method.
>+     */
>+    protected boolean onUnhandledMessage(int command, Object param) {
>+        return false;
>+    }
>+
>+    /**
>+     * A Handler class for Messages from native SDL applications.
>+     * It uses current Activities as target (e.g. for the title).
>+     * static to prevent implicit references to enclosing object.
>+     */
>+    protected static class SDLCommandHandler extends Handler {
>+        @Override
>+        public void handleMessage(Message msg) {
>+            Context context = getContext();
>+            if (context == null) {
>+                Log.e(TAG, "error handling message, getContext() returned null");
>+                return;
>+            }
>+            switch (msg.arg1) {
>+            case COMMAND_CHANGE_TITLE:
>+                if (context instanceof Activity) {
>+                    ((Activity) context).setTitle((String)msg.obj);
>+                } else {
>+                    Log.e(TAG, "error handling message, getContext() returned no Activity");
>+                }
>+                break;
>+            case COMMAND_TEXTEDIT_HIDE:
>+                if (mTextEdit != null) {
>+                    mTextEdit.setVisibility(View.GONE);
>+
>+                    InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
>+                    imm.hideSoftInputFromWindow(mTextEdit.getWindowToken(), 0);
>+                }
>+                break;
>+
>+            default:
>+                if ((context instanceof SDLActivity) && !((SDLActivity) context).onUnhandledMessage(msg.arg1, msg.obj)) {
>+                    Log.e(TAG, "error handling message, command is " + msg.arg1);
>+                }
>+            }
>+        }
>+    }
>+
>+    // Handler for the messages
>+    Handler commandHandler = new SDLCommandHandler();
>+
>+    // Send a message from the SDLMain thread
>+    boolean sendCommand(int command, Object data) {
>+        Message msg = commandHandler.obtainMessage();
>+        msg.arg1 = command;
>+        msg.obj = data;
>+        return commandHandler.sendMessage(msg);
>+    }
>+
>+    // C functions we call
>+    public static native void nativeInit();
>+    public static native void nativeLowMemory();
>+    public static native void nativeQuit();
>+    public static native void nativePause();
>+    public static native void nativeResume();
>+    public static native void onNativeResize(int x, int y, int format);
>+    public static native int onNativePadDown(int device_id, int keycode);
>+    public static native int onNativePadUp(int device_id, int keycode);
>+    public static native void onNativeJoy(int device_id, int axis,
>+                                          float value);
>+    public static native void onNativeKeyDown(int keycode);
>+    public static native void onNativeKeyUp(int keycode);
>+    public static native void onNativeKeyboardFocusLost();
>+    public static native void onNativeTouch(int touchDevId, int pointerFingerId,
>+                                            int action, float x, 
>+                                            float y, float p);
>+    public static native void onNativeAccel(float x, float y, float z);
>+    public static native void onNativeSurfaceChanged();
>+    public static native void onNativeSurfaceDestroyed();
>+    public static native void nativeFlipBuffers();
>+    public static native int nativeAddJoystick(int device_id, String name, 
>+                                               int is_accelerometer, int nbuttons, 
>+                                               int naxes, int nhats, int nballs);
>+    public static native int nativeRemoveJoystick(int device_id);
>+
>+    public static void flipBuffers() {
>+        SDLActivity.nativeFlipBuffers();
>+    }
>+
>+    public static boolean setActivityTitle(String title) {
>+        // Called from SDLMain() thread and can't directly affect the view
>+        return mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title);
>+    }
>+
>+    public static boolean sendMessage(int command, int param) {
>+        return mSingleton.sendCommand(command, Integer.valueOf(param));
>+    }
>+
>+    public static Context getContext() {
>+        return mSingleton;
>+    }
>+
>+    /**
>+     * @return result of getSystemService(name) but executed on UI thread.
>+     */
>+    public Object getSystemServiceFromUiThread(final String name) {
>+        final Object lock = new Object();
>+        final Object[] results = new Object[2]; // array for writable variables
>+        synchronized (lock) {
>+            runOnUiThread(new Runnable() {
>+                @Override
>+                public void run() {
>+                    synchronized (lock) {
>+                        results[0] = getSystemService(name);
>+                        results[1] = Boolean.TRUE;
>+                        lock.notify();
>+                    }
>+                }
>+            });
>+            if (results[1] == null) {
>+                try {
>+                    lock.wait();
>+                } catch (InterruptedException ex) {
>+                    ex.printStackTrace();
>+                }
>+            }
>+        }
>+        return results[0];
>+    }
>+
>+    static class ShowTextInputTask implements Runnable {
>+        /*
>+         * This is used to regulate the pan&scan method to have some offset from
>+         * the bottom edge of the input region and the top edge of an input
>+         * method (soft keyboard)
>+         */
>+        static final int HEIGHT_PADDING = 15;
>+
>+        public int x, y, w, h;
>+
>+        public ShowTextInputTask(int x, int y, int w, int h) {
>+            this.x = x;
>+            this.y = y;
>+            this.w = w;
>+            this.h = h;
>+        }
>+
>+        @Override
>+        public void run() {
>+            AbsoluteLayout.LayoutParams params = new AbsoluteLayout.LayoutParams(
>+                    w, h + HEIGHT_PADDING, x, y);
>+
>+            if (mTextEdit == null) {
>+                mTextEdit = new DummyEdit(getContext());
>+
>+                mLayout.addView(mTextEdit, params);
>+            } else {
>+                mTextEdit.setLayoutParams(params);
>+            }
>+
>+            mTextEdit.setVisibility(View.VISIBLE);
>+            mTextEdit.requestFocus();
>+
>+            InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
>+            imm.showSoftInput(mTextEdit, 0);
>+        }
>+    }
>+
>+    public static boolean showTextInput(int x, int y, int w, int h) {
>+        // Transfer the task to the main thread as a Runnable
>+        return mSingleton.commandHandler.post(new ShowTextInputTask(x, y, w, h));
>+    }
>+            
>+    public static Surface getNativeSurface() {
>+        return SDLActivity.mSurface.getNativeSurface();
>+    }
>+
>+    // Audio
>+    public static int audioInit(int sampleRate, boolean is16Bit, boolean isStereo, int desiredFrames) {
>+        int channelConfig = isStereo ? AudioFormat.CHANNEL_CONFIGURATION_STEREO : AudioFormat.CHANNEL_CONFIGURATION_MONO;
>+        int audioFormat = is16Bit ? AudioFormat.ENCODING_PCM_16BIT : AudioFormat.ENCODING_PCM_8BIT;
>+        int frameSize = (isStereo ? 2 : 1) * (is16Bit ? 2 : 1);
>+        
>+        Log.v("SDL", "SDL audio: wanted " + (isStereo ? "stereo" : "mono") + " " + (is16Bit ? "16-bit" : "8-bit") + " " + (sampleRate / 1000f) + "kHz, " + desiredFrames + " frames buffer");
>+        
>+        // Let the user pick a larger buffer if they really want -- but ye
>+        // gods they probably shouldn't, the minimums are horrifyingly high
>+        // latency already
>+        desiredFrames = Math.max(desiredFrames, (AudioTrack.getMinBufferSize(sampleRate, channelConfig, audioFormat) + frameSize - 1) / frameSize);
>+        
>+        if (mAudioTrack == null) {
>+            mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate,
>+                    channelConfig, audioFormat, desiredFrames * frameSize, AudioTrack.MODE_STREAM);
>+            
>+            // Instantiating AudioTrack can "succeed" without an exception and the track may still be invalid
>+            // Ref: https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/media/java/android/media/AudioTrack.java
>+            // Ref: http://developer.android.com/reference/android/media/AudioTrack.html#getState()
>+            
>+            if (mAudioTrack.getState() != AudioTrack.STATE_INITIALIZED) {
>+                Log.e("SDL", "Failed during initialization of Audio Track");
>+                mAudioTrack = null;
>+                return -1;
>+            }
>+            
>+            mAudioTrack.play();
>+        }
>+       
>+        Log.v("SDL", "SDL audio: got " + ((mAudioTrack.getChannelCount() >= 2) ? "stereo" : "mono") + " " + ((mAudioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit") + " " + (mAudioTrack.getSampleRate() / 1000f) + "kHz, " + desiredFrames + " frames buffer");
>+        
>+        return 0;
>+    }
>+    
>+    public static void audioWriteShortBuffer(short[] buffer) {
>+        for (int i = 0; i < buffer.length; ) {
>+            int result = mAudioTrack.write(buffer, i, buffer.length - i);
>+            if (result > 0) {
>+                i += result;
>+            } else if (result == 0) {
>+                try {
>+                    Thread.sleep(1);
>+                } catch(InterruptedException e) {
>+                    // Nom nom
>+                }
>+            } else {
>+                Log.w("SDL", "SDL audio: error return from write(short)");
>+                return;
>+            }
>+        }
>+    }
>+    
>+    public static void audioWriteByteBuffer(byte[] buffer) {
>+        for (int i = 0; i < buffer.length; ) {
>+            int result = mAudioTrack.write(buffer, i, buffer.length - i);
>+            if (result > 0) {
>+                i += result;
>+            } else if (result == 0) {
>+                try {
>+                    Thread.sleep(1);
>+                } catch(InterruptedException e) {
>+                    // Nom nom
>+                }
>+            } else {
>+                Log.w("SDL", "SDL audio: error return from write(byte)");
>+                return;
>+            }
>+        }
>+    }
>+
>+    public static void audioQuit() {
>+        if (mAudioTrack != null) {
>+            mAudioTrack.stop();
>+            mAudioTrack = null;
>+        }
>+    }
>+
>+    // Input
>+
>+    /**
>+     * @return an array which may be empty but is never null.
>+     */
>+    public static int[] inputGetInputDeviceIds(int sources) {
>+        int[] ids = InputDevice.getDeviceIds();
>+        int[] filtered = new int[ids.length];
>+        int used = 0;
>+        for (int i = 0; i < ids.length; ++i) {
>+            InputDevice device = InputDevice.getDevice(ids[i]);
>+            if ((device != null) && ((device.getSources() & sources) != 0)) {
>+                filtered[used++] = device.getId();
>+            }
>+        }
>+        return Arrays.copyOf(filtered, used);
>+    }
>+            
>+    // Joystick glue code, just a series of stubs that redirect to the SDLJoystickHandler instance
>+    public static boolean handleJoystickMotionEvent(MotionEvent event) {
>+        return mJoystickHandler.handleMotionEvent(event);
>+    }
>+    
>+    public static void pollInputDevices() {
>+        if (SDLActivity.mSDLThread != null) {
>+            mJoystickHandler.pollInputDevices();
>+        }
>+    }
>+    
>+}
>+
>+/**
>+    Simple nativeInit() runnable
>+*/
>+class SDLMain implements Runnable {
>+    @Override
>+    public void run() {
>+        // Runs SDL_main()
>+        SDLActivity.nativeInit();
>+
>+        //Log.v("SDL", "SDL thread terminated");
>+    }
>+}
>+
>+
>+/**
>+    SDLSurface. This is what we draw on, so we need to know when it's created
>+    in order to do anything useful. 
>+
>+    Because of this, that's where we set up the SDL thread
>+*/
>+class SDLSurface extends SurfaceView implements SurfaceHolder.Callback, 
>+    View.OnKeyListener, View.OnTouchListener, SensorEventListener  {
>+
>+    // Sensors
>+    protected static SensorManager mSensorManager;
>+    protected static Display mDisplay;
>+
>+    // Keep track of the surface size to normalize touch events
>+    protected static float mWidth, mHeight;
>+
>+    // Startup    
>+    public SDLSurface(Context context) {
>+        super(context);
>+        getHolder().addCallback(this); 
>+    
>+        setFocusable(true);
>+        setFocusableInTouchMode(true);
>+        requestFocus();
>+        setOnKeyListener(this); 
>+        setOnTouchListener(this);   
>+
>+        mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
>+        mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
>+        
>+        if(Build.VERSION.SDK_INT >= 12) {
>+            setOnGenericMotionListener(new SDLGenericMotionListener_API12());
>+        }
>+
>+        // Some arbitrary defaults to avoid a potential division by zero
>+        mWidth = 1.0f;
>+        mHeight = 1.0f;
>+    }
>+    
>+    public Surface getNativeSurface() {
>+        return getHolder().getSurface();
>+    }
>+
>+    // Called when we have a valid drawing surface
>+    @Override
>+    public void surfaceCreated(SurfaceHolder holder) {
>+        Log.v("SDL", "surfaceCreated()");
>+        holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
>+    }
>+
>+    // Called when we lose the surface
>+    @Override
>+    public void surfaceDestroyed(SurfaceHolder holder) {
>+        Log.v("SDL", "surfaceDestroyed()");
>+        // Call this *before* setting mIsSurfaceReady to 'false'
>+        SDLActivity.handlePause();
>+        SDLActivity.mIsSurfaceReady = false;
>+        SDLActivity.onNativeSurfaceDestroyed();
>+    }
>+
>+    // Called when the surface is resized
>+    @Override
>+    public void surfaceChanged(SurfaceHolder holder,
>+                               int format, int width, int height) {
>+        Log.v("SDL", "surfaceChanged()");
>+
>+        int sdlFormat = 0x15151002; // SDL_PIXELFORMAT_RGB565 by default
>+        switch (format) {
>+        case PixelFormat.A_8:
>+            Log.v("SDL", "pixel format A_8");
>+            break;
>+        case PixelFormat.LA_88:
>+            Log.v("SDL", "pixel format LA_88");
>+            break;
>+        case PixelFormat.L_8:
>+            Log.v("SDL", "pixel format L_8");
>+            break;
>+        case PixelFormat.RGBA_4444:
>+            Log.v("SDL", "pixel format RGBA_4444");
>+            sdlFormat = 0x15421002; // SDL_PIXELFORMAT_RGBA4444
>+            break;
>+        case PixelFormat.RGBA_5551:
>+            Log.v("SDL", "pixel format RGBA_5551");
>+            sdlFormat = 0x15441002; // SDL_PIXELFORMAT_RGBA5551
>+            break;
>+        case PixelFormat.RGBA_8888:
>+            Log.v("SDL", "pixel format RGBA_8888");
>+            sdlFormat = 0x16462004; // SDL_PIXELFORMAT_RGBA8888
>+            break;
>+        case PixelFormat.RGBX_8888:
>+            Log.v("SDL", "pixel format RGBX_8888");
>+            sdlFormat = 0x16261804; // SDL_PIXELFORMAT_RGBX8888
>+            break;
>+        case PixelFormat.RGB_332:
>+            Log.v("SDL", "pixel format RGB_332");
>+            sdlFormat = 0x14110801; // SDL_PIXELFORMAT_RGB332
>+            break;
>+        case PixelFormat.RGB_565:
>+            Log.v("SDL", "pixel format RGB_565");
>+            sdlFormat = 0x15151002; // SDL_PIXELFORMAT_RGB565
>+            break;
>+        case PixelFormat.RGB_888:
>+            Log.v("SDL", "pixel format RGB_888");
>+            // Not sure this is right, maybe SDL_PIXELFORMAT_RGB24 instead?
>+            sdlFormat = 0x16161804; // SDL_PIXELFORMAT_RGB888
>+            break;
>+        default:
>+            Log.v("SDL", "pixel format unknown " + format);
>+            break;
>+        }
>+
>+        mWidth = width;
>+        mHeight = height;
>+        SDLActivity.onNativeResize(width, height, sdlFormat);
>+        Log.v("SDL", "Window size:" + width + "x"+height);
>+
>+        // Set mIsSurfaceReady to 'true' *before* making a call to handleResume
>+        SDLActivity.mIsSurfaceReady = true;
>+        SDLActivity.onNativeSurfaceChanged();
>+
>+
>+        if (SDLActivity.mSDLThread == null) {
>+            // This is the entry point to the C app.
>+            // Start up the C app thread and enable sensor input for the first time
>+
>+            SDLActivity.mSDLThread = new Thread(new SDLMain(), "SDLThread");
>+            enableSensor(Sensor.TYPE_ACCELEROMETER, true);
>+            SDLActivity.mSDLThread.start();
>+            
>+            // Set up a listener thread to catch when the native thread ends
>+            new Thread(new Runnable(){
>+                @Override
>+                public void run(){
>+                    try {
>+                        SDLActivity.mSDLThread.join();
>+                    }
>+                    catch(Exception e){}
>+                    finally{ 
>+                        // Native thread has finished
>+                        if (! SDLActivity.mExitCalledFromJava) {
>+                            SDLActivity.handleNativeExit();
>+                        }
>+                    }
>+                }
>+            }).start();
>+        }
>+    }
>+
>+    // unused
>+    @Override
>+    public void onDraw(Canvas canvas) {}
>+
>+
>+    // Key events
>+    @Override
>+    public boolean onKey(View  v, int keyCode, KeyEvent event) {
>+        // Dispatch the different events depending on where they come from
>+        // Some SOURCE_DPAD or SOURCE_GAMEPAD are also SOURCE_KEYBOARD
>+        // So, we try to process them as DPAD or GAMEPAD events first, if that fails we try them as KEYBOARD
>+        
>+        if ( (event.getSource() & 0x00000401) != 0 || /* API 12: SOURCE_GAMEPAD */
>+                   (event.getSource() & InputDevice.SOURCE_DPAD) != 0 ) {
>+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+                if (SDLActivity.onNativePadDown(event.getDeviceId(), keyCode) == 0) {
>+                    return true;
>+                }
>+            } else if (event.getAction() == KeyEvent.ACTION_UP) {
>+                if (SDLActivity.onNativePadUp(event.getDeviceId(), keyCode) == 0) {
>+                    return true;
>+                }
>+            }
>+        }
>+        
>+        if( (event.getSource() & InputDevice.SOURCE_KEYBOARD) != 0) {
>+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+                //Log.v("SDL", "key down: " + keyCode);
>+                SDLActivity.onNativeKeyDown(keyCode);
>+                return true;
>+            }
>+            else if (event.getAction() == KeyEvent.ACTION_UP) {
>+                //Log.v("SDL", "key up: " + keyCode);
>+                SDLActivity.onNativeKeyUp(keyCode);
>+                return true;
>+            }
>+        }
>+        
>+        return false;
>+    }
>+
>+    // Touch events
>+    @Override
>+    public boolean onTouch(View v, MotionEvent event) {
>+        /* Ref: http://developer.android.com/training/gestures/multi.html */
>+        final int touchDevId = event.getDeviceId();
>+        final int pointerCount = event.getPointerCount();
>+        int action = event.getActionMasked();
>+        int pointerFingerId;
>+        int i = -1;
>+        float x,y,p;
>+        
>+        switch(action) {
>+            case MotionEvent.ACTION_MOVE:
>+                for (i = 0; i < pointerCount; i++) {
>+                    pointerFingerId = event.getPointerId(i);
>+                    x = event.getX(i) / mWidth;
>+                    y = event.getY(i) / mHeight;
>+                    p = event.getPressure(i);
>+                    SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
>+                }
>+                break;
>+            
>+            case MotionEvent.ACTION_UP:
>+            case MotionEvent.ACTION_DOWN:
>+                // Primary pointer up/down, the index is always zero
>+                i = 0;
>+            case MotionEvent.ACTION_POINTER_UP:
>+            case MotionEvent.ACTION_POINTER_DOWN:
>+                // Non primary pointer up/down
>+                if (i == -1) {
>+                    i = event.getActionIndex();
>+                }
>+                
>+                pointerFingerId = event.getPointerId(i);
>+                x = event.getX(i) / mWidth;
>+                y = event.getY(i) / mHeight;
>+                p = event.getPressure(i);
>+                SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
>+                break;
>+            
>+            default:
>+                break;
>+        }
>+
>+        return true;
>+   } 
>+
>+    // Sensor events
>+    public void enableSensor(int sensortype, boolean enabled) {
>+        // TODO: This uses getDefaultSensor - what if we have >1 accels?
>+        if (enabled) {
>+            mSensorManager.registerListener(this, 
>+                            mSensorManager.getDefaultSensor(sensortype), 
>+                            SensorManager.SENSOR_DELAY_GAME, null);
>+        } else {
>+            mSensorManager.unregisterListener(this, 
>+                            mSensorManager.getDefaultSensor(sensortype));
>+        }
>+    }
>+    
>+    @Override
>+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
>+        // TODO
>+    }
>+
>+    @Override
>+    public void onSensorChanged(SensorEvent event) {
>+        if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
>+            float x, y;
>+            switch (mDisplay.getRotation()) {
>+                case Surface.ROTATION_90:
>+                    x = -event.values[1];
>+                    y = event.values[0];
>+                    break;
>+                case Surface.ROTATION_270:
>+                    x = event.values[1];
>+                    y = -event.values[0];
>+                    break;
>+                case Surface.ROTATION_180:
>+                    x = -event.values[1];
>+                    y = -event.values[0];
>+                    break;
>+                default:
>+                    x = event.values[0];
>+                    y = event.values[1];
>+                    break;
>+            }
>+            SDLActivity.onNativeAccel(-x / SensorManager.GRAVITY_EARTH,
>+                                      y / SensorManager.GRAVITY_EARTH,
>+                                      event.values[2] / SensorManager.GRAVITY_EARTH - 1);
>+        }
>+    }    
>+}
>+
>+/* This is a fake invisible editor view that receives the input and defines the
>+ * pan&scan region
>+ */
>+class DummyEdit extends View implements View.OnKeyListener {
>+    InputConnection ic;
>+
>+    public DummyEdit(Context context) {
>+        super(context);
>+        setFocusableInTouchMode(true);
>+        setFocusable(true);
>+        setOnKeyListener(this);
>+    }
>+
>+    @Override
>+    public boolean onCheckIsTextEditor() {
>+        return true;
>+    }
>+
>+    @Override
>+    public boolean onKey(View v, int keyCode, KeyEvent event) {
>+
>+        // This handles the hardware keyboard input
>+        if (event.isPrintingKey()) {
>+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+                ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1);
>+            }
>+            return true;
>+        }
>+
>+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+            SDLActivity.onNativeKeyDown(keyCode);
>+            return true;
>+        } else if (event.getAction() == KeyEvent.ACTION_UP) {
>+            SDLActivity.onNativeKeyUp(keyCode);
>+            return true;
>+        }
>+
>+        return false;
>+    }
>+        
>+    //
>+    @Override
>+    public boolean onKeyPreIme (int keyCode, KeyEvent event) {
>+        // As seen on StackOverflow: http://stackoverflow.com/questions/7634346/keyboard-hide-event
>+        // FIXME: Discussion at http://bugzilla.libsdl.org/show_bug.cgi?id=1639
>+        // FIXME: This is not a 100% effective solution to the problem of detecting if the keyboard is showing or not
>+        // FIXME: A more effective solution would be to change our Layout from AbsoluteLayout to Relative or Linear
>+        // FIXME: And determine the keyboard presence doing this: http://stackoverflow.com/questions/2150078/how-to-check-visibility-of-software-keyboard-in-android
>+        // FIXME: An even more effective way would be if Android provided this out of the box, but where would the fun be in that :)
>+        if (event.getAction()==KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
>+            if (SDLActivity.mTextEdit != null && SDLActivity.mTextEdit.getVisibility() == View.VISIBLE) {
>+                SDLActivity.onNativeKeyboardFocusLost();
>+            }
>+        }
>+        return super.onKeyPreIme(keyCode, event);
>+    }
>+
>+    @Override
>+    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
>+        ic = new SDLInputConnection(this, true);
>+
>+        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
>+                | 33554432 /* API 11: EditorInfo.IME_FLAG_NO_FULLSCREEN */;
>+
>+        return ic;
>+    }
>+}
>+
>+class SDLInputConnection extends BaseInputConnection {
>+
>+    public SDLInputConnection(View targetView, boolean fullEditor) {
>+        super(targetView, fullEditor);
>+
>+    }
>+
>+    @Override
>+    public boolean sendKeyEvent(KeyEvent event) {
>+
>+        /*
>+         * This handles the keycodes from soft keyboard (and IME-translated
>+         * input from hardkeyboard)
>+         */
>+        int keyCode = event.getKeyCode();
>+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+            if (event.isPrintingKey()) {
>+                commitText(String.valueOf((char) event.getUnicodeChar()), 1);
>+            }
>+            SDLActivity.onNativeKeyDown(keyCode);
>+            return true;
>+        } else if (event.getAction() == KeyEvent.ACTION_UP) {
>+
>+            SDLActivity.onNativeKeyUp(keyCode);
>+            return true;
>+        }
>+        return super.sendKeyEvent(event);
>+    }
>+
>+    @Override
>+    public boolean commitText(CharSequence text, int newCursorPosition) {
>+
>+        nativeCommitText(text.toString(), newCursorPosition);
>+
>+        return super.commitText(text, newCursorPosition);
>+    }
>+
>+    @Override
>+    public boolean setComposingText(CharSequence text, int newCursorPosition) {
>+
>+        nativeSetComposingText(text.toString(), newCursorPosition);
>+
>+        return super.setComposingText(text, newCursorPosition);
>+    }
>+
>+    public native void nativeCommitText(String text, int newCursorPosition);
>+
>+    public native void nativeSetComposingText(String text, int newCursorPosition);
>+
>+    @Override
>+    public boolean deleteSurroundingText(int beforeLength, int afterLength) {       
>+        // Workaround to capture backspace key. Ref: http://stackoverflow.com/questions/14560344/android-backspace-in-webview-baseinputconnection
>+        if (beforeLength == 1 && afterLength == 0) {
>+            // backspace
>+            return super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL))
>+                && super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL));
>+        }
>+
>+        return super.deleteSurroundingText(beforeLength, afterLength);
>+    }
>+}
>+
>+/* A null joystick handler for API level < 12 devices (the accelerometer is handled separately) */
>+class SDLJoystickHandler {
>+    
>+    public boolean handleMotionEvent(MotionEvent event) {
>+        return false;
>+    }
>+    
>+    public void pollInputDevices() {
>+    }
>+}
>+
>+/* Actual joystick functionality available for API >= 12 devices */
>+class SDLJoystickHandler_API12 extends SDLJoystickHandler {
>+  
>+    class SDLJoystick {
>+        public int device_id;
>+        public String name;
>+        public ArrayList<InputDevice.MotionRange> axes;
>+    }
>+    
>+    private ArrayList<SDLJoystick> mJoysticks;
>+    
>+    public SDLJoystickHandler_API12() {
>+       
>+        mJoysticks = new ArrayList<SDLJoystick>();
>+    }
>+
>+    @Override
>+    public void pollInputDevices() {
>+        int[] deviceIds = InputDevice.getDeviceIds();
>+        // It helps processing the device ids in reverse order
>+        // For example, in the case of the XBox 360 wireless dongle,
>+        // so the first controller seen by SDL matches what the receiver
>+        // considers to be the first controller
>+        
>+        for(int i=deviceIds.length-1; i>-1; i--) {
>+            SDLJoystick joystick = getJoystick(deviceIds[i]);
>+            if (joystick == null) {
>+                joystick = new SDLJoystick();
>+                InputDevice joystickDevice = InputDevice.getDevice(deviceIds[i]);
>+                if( (joystickDevice.getSources() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
>+                    joystick.device_id = deviceIds[i];
>+                    joystick.name = joystickDevice.getName();
>+                    joystick.axes = new ArrayList<InputDevice.MotionRange>();
>+                    
>+                    for (InputDevice.MotionRange range : joystickDevice.getMotionRanges()) {
>+                         if ( (range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
>+                            joystick.axes.add(range);
>+                         }
>+                    }
>+                    
>+                    mJoysticks.add(joystick);
>+                    SDLActivity.nativeAddJoystick(joystick.device_id, joystick.name, 0, -1, joystick.axes.size(), 0, 0);
>+                }
>+            }
>+        }
>+        
>+        /* Check removed devices */
>+        ArrayList<Integer> removedDevices = new ArrayList<Integer>();
>+        for(int i=0; i < mJoysticks.size(); i++) {
>+            int device_id = mJoysticks.get(i).device_id;
>+            int j;
>+            for (j=0; j < deviceIds.length; j++) {
>+                if (device_id == deviceIds[j]) break;
>+            }
>+            if (j == deviceIds.length) {
>+                removedDevices.add(device_id);
>+            }
>+        }
>+            
>+        for(int i=0; i < removedDevices.size(); i++) {
>+            int device_id = removedDevices.get(i);
>+            SDLActivity.nativeRemoveJoystick(device_id);
>+            for (int j=0; j < mJoysticks.size(); j++) {
>+                if (mJoysticks.get(j).device_id == device_id) {
>+                    mJoysticks.remove(j);
>+                    break;
>+                }
>+            }
>+        }        
>+    }
>+    
>+    protected SDLJoystick getJoystick(int device_id) {
>+        for(int i=0; i < mJoysticks.size(); i++) {
>+            if (mJoysticks.get(i).device_id == device_id) {
>+                return mJoysticks.get(i);
>+            }
>+        }
>+        return null;
>+    }   
>+    
>+    @Override        
>+    public boolean handleMotionEvent(MotionEvent event) {
>+        if ( (event.getSource() & InputDevice.SOURCE_JOYSTICK) != 0) {
>+            int actionPointerIndex = event.getActionIndex();
>+            int action = event.getActionMasked();
>+            switch(action) {
>+                case MotionEvent.ACTION_MOVE:
>+                    SDLJoystick joystick = getJoystick(event.getDeviceId());
>+                    if ( joystick != null ) {
>+                        for (int i = 0; i < joystick.axes.size(); i++) {
>+                            InputDevice.MotionRange range = joystick.axes.get(i);
>+                            /* Normalize the value to -1...1 */
>+                            float value = ( event.getAxisValue( range.getAxis(), actionPointerIndex) - range.getMin() ) / range.getRange() * 2.0f - 1.0f;
>+                            SDLActivity.onNativeJoy(joystick.device_id, i, value );
>+                        }                       
>+                    }
>+                    break;
>+                default:
>+                    break;
>+            }
>+        }
>+        return true;
>+    }            
>+}
>+
>+class SDLGenericMotionListener_API12 implements View.OnGenericMotionListener {
>+    // Generic Motion (mouse hover, joystick...) events go here
>+    // We only have joysticks yet
>+    @Override
>+    public boolean onGenericMotion(View v, MotionEvent event) {
>+        return SDLActivity.handleJoystickMotionEvent(event);
>+    }
>+}
>diff -r 1b62b081a83b android/spritetest2/.classpath
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/spritetest2/.classpath	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,9 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<classpath>
>+	<classpathentry kind="src" path="src"/>
>+	<classpathentry kind="src" path="gen"/>
>+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
>+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
>+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
>+	<classpathentry kind="output" path="bin/classes"/>
>+</classpath>
>diff -r 1b62b081a83b android/spritetest2/.project
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/spritetest2/.project	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,33 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<projectDescription>
>+	<name>Sprite Test 2</name>
>+	<comment></comment>
>+	<projects>
>+	</projects>
>+	<buildSpec>
>+		<buildCommand>
>+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>org.eclipse.jdt.core.javabuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+	</buildSpec>
>+	<natures>
>+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
>+		<nature>org.eclipse.jdt.core.javanature</nature>
>+	</natures>
>+</projectDescription>
>diff -r 1b62b081a83b android/spritetest2/.settings/org.eclipse.ltk.core.refactoring.prefs
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/spritetest2/.settings/org.eclipse.ltk.core.refactoring.prefs	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,2 @@
>+eclipse.preferences.version=1
>+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
>diff -r 1b62b081a83b android/spritetest2/AndroidManifest.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/spritetest2/AndroidManifest.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,43 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+
>+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
>+      package="org.libsdl.spritetest2"
>+      android:versionCode="1"
>+      android:versionName="1.0"
>+      android:installLocation="auto">
>+
>+    
>+    <application android:label="@string/app_name"
>+                 android:icon="@drawable/ic_launcher"
>+                 android:allowBackup="true"
>+                 android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
>+        <activity android:name="SDLActivity"
>+                  android:label="@string/app_name">
>+            <intent-filter>
>+                <action android:name="android.intent.action.MAIN" />
>+                <category android:name="android.intent.category.LAUNCHER" />
>+                <category android:name="tv.ouya.intent.category.APP"/>
>+                </intent-filter>
>+        </activity>
>+            
>+    </application>
>+
>+    
>+    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10" />
>+
>+    
>+    <uses-feature android:glEsVersion="0x00020000" /> 
>+
>+    
>+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 
>+</manifest> 
>diff -r 1b62b081a83b android/spritetest2/ant.properties
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/spritetest2/ant.properties	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,17 @@
>+# This file is used to override default values used by the Ant build system.
>+#
>+# This file must be checked into Version Control Systems, as it is
>+# integral to the build system of your project.
>+
>+# This file is only used by the Ant script.
>+
>+# You can use this to override default values such as
>+#  'source.dir' for the location of your java source folder and
>+#  'out.dir' for the location of your output folder.
>+
>+# You can also use it define how the release builds are signed by declaring
>+# the following properties:
>+#  'key.store' for the location of your keystore and
>+#  'key.alias' for the name of the key to use.
>+# The password will be asked during the build when you use the 'release' target.
>+
>diff -r 1b62b081a83b android/spritetest2/build.properties
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/spritetest2/build.properties	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,17 @@
>+# This file is used to override default values used by the Ant build system.
>+# 
>+# This file must be checked in Version Control Systems, as it is
>+# integral to the build system of your project.
>+
>+# This file is only used by the Ant script.
>+
>+# You can use this to override default values such as
>+#  'source.dir' for the location of your java source folder and
>+#  'out.dir' for the location of your output folder.
>+
>+# You can also use it define how the release builds are signed by declaring
>+# the following properties:
>+#  'key.store' for the location of your keystore and
>+#  'key.alias' for the name of the key to use.
>+# The password will be asked during the build when you use the 'release' target.
>+
>diff -r 1b62b081a83b android/spritetest2/build.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/spritetest2/build.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,93 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+
>+<project name="Sprite Test 2" default="help">
>+
>+    
>+    <property file="local.properties" />
>+
>+    
>+    <property file="ant.properties" />
>+
>+    
>+    <property environment="env" />
>+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
>+        <isset property="env.ANDROID_HOME" />
>+    </condition>
>+
>+    
>+    <loadproperties srcFile="project.properties" />
>+
>+    
>+    <fail
>+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
>+            unless="sdk.dir"
>+    />
>+
>+    
>+    <import file="custom_rules.xml" optional="true" />
>+
>+    
>+    
>+    <import file="${sdk.dir}/tools/ant/build.xml" />
>+
>+</project>
>diff -r 1b62b081a83b android/spritetest2/clean.sh
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/spritetest2/clean.sh	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,5 @@
>+rm -rf bin
>+rm -rf gen
>+rm -rf obj
>+rm -rf libs
>+rm -f assets/*.bmp
>diff -r 1b62b081a83b android/spritetest2/default.properties
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/spritetest2/default.properties	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,11 @@
>+# This file is automatically generated by Android Tools.
>+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
>+# 
>+# This file must be checked in Version Control Systems.
>+# 
>+# To customize properties used by the Ant build system use,
>+# "build.properties", and override values to adapt the script to your
>+# project structure.
>+
>+# Project target.
>+target=android-7
>diff -r 1b62b081a83b android/spritetest2/jni/Android.mk
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/spritetest2/jni/Android.mk	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,1 @@
>+include $(call all-subdir-makefiles)
>diff -r 1b62b081a83b android/spritetest2/jni/Application.mk
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/spritetest2/jni/Application.mk	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,6 @@
>+APP_ABI := armeabi x86
>+APP_PLATFORM := android-9
>+
>+# Uncomment this if you're using STL in your project
>+# See CPLUSPLUS-SUPPORT.html in the NDK documentation for more information
>+# APP_STL := stlport_static 
>diff -r 1b62b081a83b android/spritetest2/jni/SDL/Android.mk
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/spritetest2/jni/SDL/Android.mk	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,52 @@
>+LOCAL_PATH := $(SDL2_HOME)
>+
>+###########################
>+#
>+# SDL shared library
>+#
>+###########################
>+
>+include $(CLEAR_VARS)
>+
>+LOCAL_MODULE := SDL2
>+
>+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
>+
>+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
>+
>+LOCAL_SRC_FILES := \
>+	$(subst $(LOCAL_PATH)/,, \
>+	$(wildcard $(LOCAL_PATH)/src/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/audio/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/audio/android/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/audio/dummy/*.c) \
>+	$(LOCAL_PATH)/src/atomic/SDL_atomic.c \
>+	$(LOCAL_PATH)/src/atomic/SDL_spinlock.c.arm \
>+	$(wildcard $(LOCAL_PATH)/src/core/android/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/cpuinfo/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/dynapi/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/events/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/file/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/haptic/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/haptic/dummy/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/joystick/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/joystick/android/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/power/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/power/android/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/filesystem/dummy/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/render/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/render/*/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/thread/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/thread/pthread/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/timer/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/timer/unix/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/video/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/video/android/*.c))
>+
>+LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DSDL_PREFIX=org_libsdl_spritetest2
>+LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
>+
>+
>+include $(BUILD_SHARED_LIBRARY)
>diff -r 1b62b081a83b android/spritetest2/jni/src/Android.mk
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/spritetest2/jni/src/Android.mk	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,40 @@
>+LOCAL_PATH := $(call my-dir)
>+
>+include $(CLEAR_VARS)
>+
>+LOCAL_MODULE := main
>+
>+ifdef "$(SDL2_HOME)"
>+  SDL2_PATH := $(SDL2_HOME)
>+else
>+  SDL2_PATH := ../../../..
>+endif
>+
>+LOCAL_C_INCLUDES := $(SDL_PATH)/include
>+
>+.PHONY: all clean
>+
>+all : post-build
>+
>+# Copy assets
>+ASSETS_PATH = assets
>+ASSETS_SRC = $(SDL2_HOME)/Xcode-iOS/Demos/data
>+
>+post-build:
>+	@echo Copy assets
>+	cp $(ASSETS_SRC)/icon.bmp $(ASSETS_PATH)
>+
>+# Add your application source files here...
>+LOCAL_SRC_FILES := $(SDL2_PATH)/src/main/android/SDL_android_main.c \
>+	$(SDL2_PATH)/test/testsprite2.c \
>+	$(SDL2_PATH)/src/test/SDL_test_common.c \
>+	$(SDL2_PATH)/src/test/SDL_test_fuzzer.c \
>+	$(SDL2_PATH)/src/test/SDL_test_random.c
>+
>+LOCAL_CFLAGS += -DSDL_PREFIX=org_libsdl_spritetest2
>+
>+LOCAL_SHARED_LIBRARIES := SDL2
>+
>+LOCAL_LDLIBS := -lGLESv1_CM -llog
>+
>+include $(BUILD_SHARED_LIBRARY)
>diff -r 1b62b081a83b android/spritetest2/lint.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/spritetest2/lint.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,3 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<lint>
>+</lint>
>\ No newline at end of file
>diff -r 1b62b081a83b android/spritetest2/proguard-project.txt
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/spritetest2/proguard-project.txt	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,20 @@
>+# To enable ProGuard in your project, edit project.properties
>+# to define the proguard.config property as described in that file.
>+#
>+# Add project specific ProGuard rules here.
>+# By default, the flags in this file are appended to flags specified
>+# in ${sdk.dir}/tools/proguard/proguard-android.txt
>+# You can edit the include path and order by changing the ProGuard
>+# include property in project.properties.
>+#
>+# For more details, see
>+#   http://developer.android.com/guide/developing/tools/proguard.html
>+
>+# Add any project specific keep options here:
>+
>+# If your project uses WebView with JS, uncomment the following
>+# and specify the fully qualified class name to the JavaScript interface
>+# class:
>+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
>+#   public *;
>+#}
>diff -r 1b62b081a83b android/spritetest2/project.properties
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/spritetest2/project.properties	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,14 @@
>+# This file is automatically generated by Android Tools.
>+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
>+#
>+# This file must be checked in Version Control Systems.
>+#
>+# To customize properties used by the Ant build system edit
>+# "ant.properties", and override values to adapt the script to your
>+# project structure.
>+#
>+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
>+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
>+
>+# Project target.
>+target=android-16
>diff -r 1b62b081a83b android/spritetest2/res/drawable-hdpi/ic_launcher.png
>Binary file android/spritetest2/res/drawable-hdpi/ic_launcher.png has changed
>diff -r 1b62b081a83b android/spritetest2/res/drawable-mdpi/ic_launcher.png
>Binary file android/spritetest2/res/drawable-mdpi/ic_launcher.png has changed
>diff -r 1b62b081a83b android/spritetest2/res/drawable-xhdpi/ic_launcher.png
>Binary file android/spritetest2/res/drawable-xhdpi/ic_launcher.png has changed
>diff -r 1b62b081a83b android/spritetest2/res/drawable-xxhdpi/ic_launcher.png
>Binary file android/spritetest2/res/drawable-xxhdpi/ic_launcher.png has changed
>diff -r 1b62b081a83b android/spritetest2/res/layout/main.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/spritetest2/res/layout/main.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,13 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
>+    android:orientation="vertical"
>+    android:layout_width="fill_parent"
>+    android:layout_height="fill_parent"
>+    >
>+<TextView  
>+    android:layout_width="fill_parent" 
>+    android:layout_height="wrap_content" 
>+    android:text="Hello World, SDLActivity"
>+    />
>+</LinearLayout>
>+
>diff -r 1b62b081a83b android/spritetest2/res/values/strings.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/spritetest2/res/values/strings.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,4 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+<resources>
>+    <string name="app_name">Sprite Test2</string>
>+</resources>
>diff -r 1b62b081a83b android/spritetest2/src/org/libsdl/spritetest2/SDLActivity.java
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/spritetest2/src/org/libsdl/spritetest2/SDLActivity.java	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,1029 @@
>+package org.libsdl.spritetest2;
>+
>+import java.util.ArrayList;
>+import java.util.Arrays;
>+
>+import android.app.*;
>+import android.content.*;
>+import android.view.*;
>+import android.view.inputmethod.BaseInputConnection;
>+import android.view.inputmethod.EditorInfo;
>+import android.view.inputmethod.InputConnection;
>+import android.view.inputmethod.InputMethodManager;
>+import android.widget.AbsoluteLayout;
>+import android.os.*;
>+import android.util.Log;
>+import android.graphics.*;
>+import android.media.*;
>+import android.hardware.*;
>+
>+
>+/**
>+    SDL Activity
>+*/
>+public class SDLActivity extends Activity {
>+    private static final String TAG = "SDL";
>+
>+    // Keep track of the paused state
>+    public static boolean mIsPaused = false, mIsSurfaceReady = false, mHasFocus = true;
>+    public static boolean mExitCalledFromJava;
>+
>+    // Main components
>+    protected static SDLActivity mSingleton;
>+    protected static SDLSurface mSurface;
>+    protected static View mTextEdit;
>+    protected static ViewGroup mLayout;
>+    protected static SDLJoystickHandler mJoystickHandler;
>+
>+    // This is what SDL runs in. It invokes SDL_main(), eventually
>+    protected static Thread mSDLThread;
>+    
>+    // Audio
>+    protected static Thread mAudioThread;
>+    protected static AudioTrack mAudioTrack;
>+
>+    // Load the .so
>+    static {
>+        System.loadLibrary("SDL2");
>+        //System.loadLibrary("SDL2_image");
>+        //System.loadLibrary("SDL2_mixer");
>+        //System.loadLibrary("SDL2_net");
>+        //System.loadLibrary("SDL2_ttf");
>+        System.loadLibrary("main");
>+    }
>+
>+    // Setup
>+    @Override
>+    protected void onCreate(Bundle savedInstanceState) {
>+        //Log.v("SDL", "onCreate()");
>+        super.onCreate(savedInstanceState);
>+        
>+        // So we can call stuff from static callbacks
>+        mSingleton = this;
>+
>+        // Set up the surface
>+        mSurface = new SDLSurface(getApplication());
>+        
>+        // Make sure this variable is initialized here!
>+        mExitCalledFromJava = false;
>+        
>+        if(Build.VERSION.SDK_INT >= 12) {
>+            mJoystickHandler = new SDLJoystickHandler_API12();
>+        }
>+        else {
>+            mJoystickHandler = new SDLJoystickHandler();
>+        }
>+
>+        mLayout = new AbsoluteLayout(this);
>+        mLayout.addView(mSurface);
>+
>+        setContentView(mLayout);
>+    }
>+
>+    // Events
>+    @Override
>+    protected void onPause() {
>+        Log.v("SDL", "onPause()");
>+        super.onPause();
>+        SDLActivity.handlePause();
>+    }
>+
>+    @Override
>+    protected void onResume() {
>+        Log.v("SDL", "onResume()");
>+        super.onResume();
>+        SDLActivity.handleResume();
>+    }
>+
>+
>+    @Override
>+    public void onWindowFocusChanged(boolean hasFocus) {
>+        super.onWindowFocusChanged(hasFocus);
>+        Log.v("SDL", "onWindowFocusChanged(): " + hasFocus);
>+
>+        SDLActivity.mHasFocus = hasFocus;
>+        if (hasFocus) {
>+            SDLActivity.handleResume();
>+        }
>+    }
>+
>+    @Override
>+    public void onLowMemory() {
>+        Log.v("SDL", "onLowMemory()");
>+        super.onLowMemory();
>+        SDLActivity.nativeLowMemory();
>+    }
>+
>+    @Override
>+    protected void onDestroy() {
>+        super.onDestroy();
>+        Log.v("SDL", "onDestroy()");
>+        // Send a quit message to the application
>+        SDLActivity.mExitCalledFromJava = true;
>+        SDLActivity.nativeQuit();
>+
>+        // Now wait for the SDL thread to quit
>+        if (SDLActivity.mSDLThread != null) {
>+            try {
>+                SDLActivity.mSDLThread.join();
>+            } catch(Exception e) {
>+                Log.v("SDL", "Problem stopping thread: " + e);
>+            }
>+            SDLActivity.mSDLThread = null;
>+
>+            //Log.v("SDL", "Finished waiting for SDL thread");
>+        }
>+    }
>+
>+    @Override
>+    public boolean dispatchKeyEvent(KeyEvent event) {
>+        int keyCode = event.getKeyCode();
>+        // Ignore certain special keys so they're handled by Android
>+        if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
>+            keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
>+            keyCode == KeyEvent.KEYCODE_CAMERA ||
>+            keyCode == 168 || /* API 11: KeyEvent.KEYCODE_ZOOM_IN */
>+            keyCode == 169 /* API 11: KeyEvent.KEYCODE_ZOOM_OUT */
>+            ) {
>+            return false;
>+        }
>+        return super.dispatchKeyEvent(event);
>+    }
>+
>+    /** Called by onPause or surfaceDestroyed. Even if surfaceDestroyed
>+     *  is the first to be called, mIsSurfaceReady should still be set
>+     *  to 'true' during the call to onPause (in a usual scenario).
>+     */
>+    public static void handlePause() {
>+        if (!SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady) {
>+            SDLActivity.mIsPaused = true;
>+            SDLActivity.nativePause();
>+            mSurface.enableSensor(Sensor.TYPE_ACCELEROMETER, false);
>+        }
>+    }
>+
>+    /** Called by onResume or surfaceCreated. An actual resume should be done only when the surface is ready.
>+     * Note: Some Android variants may send multiple surfaceChanged events, so we don't need to resume
>+     * every time we get one of those events, only if it comes after surfaceDestroyed
>+     */
>+    public static void handleResume() {
>+        if (SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady && SDLActivity.mHasFocus) {
>+            SDLActivity.mIsPaused = false;
>+            SDLActivity.nativeResume();
>+            mSurface.enableSensor(Sensor.TYPE_ACCELEROMETER, true);
>+        }
>+    }
>+        
>+    /* The native thread has finished */
>+    public static void handleNativeExit() {
>+        SDLActivity.mSDLThread = null;
>+        mSingleton.finish();
>+    }
>+
>+
>+    // Messages from the SDLMain thread
>+    static final int COMMAND_CHANGE_TITLE = 1;
>+    static final int COMMAND_UNUSED = 2;
>+    static final int COMMAND_TEXTEDIT_HIDE = 3;
>+
>+    protected static final int COMMAND_USER = 0x8000;
>+
>+    /**
>+     * This method is called by SDL if SDL did not handle a message itself.
>+     * This happens if a received message contains an unsupported command.
>+     * Method can be overwritten to handle Messages in a different class.
>+     * @param command the command of the message.
>+     * @param param the parameter of the message. May be null.
>+     * @return if the message was handled in overridden method.
>+     */
>+    protected boolean onUnhandledMessage(int command, Object param) {
>+        return false;
>+    }
>+
>+    /**
>+     * A Handler class for Messages from native SDL applications.
>+     * It uses current Activities as target (e.g. for the title).
>+     * static to prevent implicit references to enclosing object.
>+     */
>+    protected static class SDLCommandHandler extends Handler {
>+        @Override
>+        public void handleMessage(Message msg) {
>+            Context context = getContext();
>+            if (context == null) {
>+                Log.e(TAG, "error handling message, getContext() returned null");
>+                return;
>+            }
>+            switch (msg.arg1) {
>+            case COMMAND_CHANGE_TITLE:
>+                if (context instanceof Activity) {
>+                    ((Activity) context).setTitle((String)msg.obj);
>+                } else {
>+                    Log.e(TAG, "error handling message, getContext() returned no Activity");
>+                }
>+                break;
>+            case COMMAND_TEXTEDIT_HIDE:
>+                if (mTextEdit != null) {
>+                    mTextEdit.setVisibility(View.GONE);
>+
>+                    InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
>+                    imm.hideSoftInputFromWindow(mTextEdit.getWindowToken(), 0);
>+                }
>+                break;
>+
>+            default:
>+                if ((context instanceof SDLActivity) && !((SDLActivity) context).onUnhandledMessage(msg.arg1, msg.obj)) {
>+                    Log.e(TAG, "error handling message, command is " + msg.arg1);
>+                }
>+            }
>+        }
>+    }
>+
>+    // Handler for the messages
>+    Handler commandHandler = new SDLCommandHandler();
>+
>+    // Send a message from the SDLMain thread
>+    boolean sendCommand(int command, Object data) {
>+        Message msg = commandHandler.obtainMessage();
>+        msg.arg1 = command;
>+        msg.obj = data;
>+        return commandHandler.sendMessage(msg);
>+    }
>+
>+    // C functions we call
>+    public static native void nativeInit();
>+    public static native void nativeLowMemory();
>+    public static native void nativeQuit();
>+    public static native void nativePause();
>+    public static native void nativeResume();
>+    public static native void onNativeResize(int x, int y, int format);
>+    public static native int onNativePadDown(int device_id, int keycode);
>+    public static native int onNativePadUp(int device_id, int keycode);
>+    public static native void onNativeJoy(int device_id, int axis,
>+                                          float value);
>+    public static native void onNativeKeyDown(int keycode);
>+    public static native void onNativeKeyUp(int keycode);
>+    public static native void onNativeKeyboardFocusLost();
>+    public static native void onNativeTouch(int touchDevId, int pointerFingerId,
>+                                            int action, float x, 
>+                                            float y, float p);
>+    public static native void onNativeAccel(float x, float y, float z);
>+    public static native void onNativeSurfaceChanged();
>+    public static native void onNativeSurfaceDestroyed();
>+    public static native void nativeFlipBuffers();
>+    public static native int nativeAddJoystick(int device_id, String name, 
>+                                               int is_accelerometer, int nbuttons, 
>+                                               int naxes, int nhats, int nballs);
>+    public static native int nativeRemoveJoystick(int device_id);
>+
>+    public static void flipBuffers() {
>+        SDLActivity.nativeFlipBuffers();
>+    }
>+
>+    public static boolean setActivityTitle(String title) {
>+        // Called from SDLMain() thread and can't directly affect the view
>+        return mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title);
>+    }
>+
>+    public static boolean sendMessage(int command, int param) {
>+        return mSingleton.sendCommand(command, Integer.valueOf(param));
>+    }
>+
>+    public static Context getContext() {
>+        return mSingleton;
>+    }
>+
>+    /**
>+     * @return result of getSystemService(name) but executed on UI thread.
>+     */
>+    public Object getSystemServiceFromUiThread(final String name) {
>+        final Object lock = new Object();
>+        final Object[] results = new Object[2]; // array for writable variables
>+        synchronized (lock) {
>+            runOnUiThread(new Runnable() {
>+                @Override
>+                public void run() {
>+                    synchronized (lock) {
>+                        results[0] = getSystemService(name);
>+                        results[1] = Boolean.TRUE;
>+                        lock.notify();
>+                    }
>+                }
>+            });
>+            if (results[1] == null) {
>+                try {
>+                    lock.wait();
>+                } catch (InterruptedException ex) {
>+                    ex.printStackTrace();
>+                }
>+            }
>+        }
>+        return results[0];
>+    }
>+
>+    static class ShowTextInputTask implements Runnable {
>+        /*
>+         * This is used to regulate the pan&scan method to have some offset from
>+         * the bottom edge of the input region and the top edge of an input
>+         * method (soft keyboard)
>+         */
>+        static final int HEIGHT_PADDING = 15;
>+
>+        public int x, y, w, h;
>+
>+        public ShowTextInputTask(int x, int y, int w, int h) {
>+            this.x = x;
>+            this.y = y;
>+            this.w = w;
>+            this.h = h;
>+        }
>+
>+        @Override
>+        public void run() {
>+            AbsoluteLayout.LayoutParams params = new AbsoluteLayout.LayoutParams(
>+                    w, h + HEIGHT_PADDING, x, y);
>+
>+            if (mTextEdit == null) {
>+                mTextEdit = new DummyEdit(getContext());
>+
>+                mLayout.addView(mTextEdit, params);
>+            } else {
>+                mTextEdit.setLayoutParams(params);
>+            }
>+
>+            mTextEdit.setVisibility(View.VISIBLE);
>+            mTextEdit.requestFocus();
>+
>+            InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
>+            imm.showSoftInput(mTextEdit, 0);
>+        }
>+    }
>+
>+    public static boolean showTextInput(int x, int y, int w, int h) {
>+        // Transfer the task to the main thread as a Runnable
>+        return mSingleton.commandHandler.post(new ShowTextInputTask(x, y, w, h));
>+    }
>+            
>+    public static Surface getNativeSurface() {
>+        return SDLActivity.mSurface.getNativeSurface();
>+    }
>+
>+    // Audio
>+    public static int audioInit(int sampleRate, boolean is16Bit, boolean isStereo, int desiredFrames) {
>+        int channelConfig = isStereo ? AudioFormat.CHANNEL_CONFIGURATION_STEREO : AudioFormat.CHANNEL_CONFIGURATION_MONO;
>+        int audioFormat = is16Bit ? AudioFormat.ENCODING_PCM_16BIT : AudioFormat.ENCODING_PCM_8BIT;
>+        int frameSize = (isStereo ? 2 : 1) * (is16Bit ? 2 : 1);
>+        
>+        Log.v("SDL", "SDL audio: wanted " + (isStereo ? "stereo" : "mono") + " " + (is16Bit ? "16-bit" : "8-bit") + " " + (sampleRate / 1000f) + "kHz, " + desiredFrames + " frames buffer");
>+        
>+        // Let the user pick a larger buffer if they really want -- but ye
>+        // gods they probably shouldn't, the minimums are horrifyingly high
>+        // latency already
>+        desiredFrames = Math.max(desiredFrames, (AudioTrack.getMinBufferSize(sampleRate, channelConfig, audioFormat) + frameSize - 1) / frameSize);
>+        
>+        if (mAudioTrack == null) {
>+            mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate,
>+                    channelConfig, audioFormat, desiredFrames * frameSize, AudioTrack.MODE_STREAM);
>+            
>+            // Instantiating AudioTrack can "succeed" without an exception and the track may still be invalid
>+            // Ref: https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/media/java/android/media/AudioTrack.java
>+            // Ref: http://developer.android.com/reference/android/media/AudioTrack.html#getState()
>+            
>+            if (mAudioTrack.getState() != AudioTrack.STATE_INITIALIZED) {
>+                Log.e("SDL", "Failed during initialization of Audio Track");
>+                mAudioTrack = null;
>+                return -1;
>+            }
>+            
>+            mAudioTrack.play();
>+        }
>+       
>+        Log.v("SDL", "SDL audio: got " + ((mAudioTrack.getChannelCount() >= 2) ? "stereo" : "mono") + " " + ((mAudioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit") + " " + (mAudioTrack.getSampleRate() / 1000f) + "kHz, " + desiredFrames + " frames buffer");
>+        
>+        return 0;
>+    }
>+    
>+    public static void audioWriteShortBuffer(short[] buffer) {
>+        for (int i = 0; i < buffer.length; ) {
>+            int result = mAudioTrack.write(buffer, i, buffer.length - i);
>+            if (result > 0) {
>+                i += result;
>+            } else if (result == 0) {
>+                try {
>+                    Thread.sleep(1);
>+                } catch(InterruptedException e) {
>+                    // Nom nom
>+                }
>+            } else {
>+                Log.w("SDL", "SDL audio: error return from write(short)");
>+                return;
>+            }
>+        }
>+    }
>+    
>+    public static void audioWriteByteBuffer(byte[] buffer) {
>+        for (int i = 0; i < buffer.length; ) {
>+            int result = mAudioTrack.write(buffer, i, buffer.length - i);
>+            if (result > 0) {
>+                i += result;
>+            } else if (result == 0) {
>+                try {
>+                    Thread.sleep(1);
>+                } catch(InterruptedException e) {
>+                    // Nom nom
>+                }
>+            } else {
>+                Log.w("SDL", "SDL audio: error return from write(byte)");
>+                return;
>+            }
>+        }
>+    }
>+
>+    public static void audioQuit() {
>+        if (mAudioTrack != null) {
>+            mAudioTrack.stop();
>+            mAudioTrack = null;
>+        }
>+    }
>+
>+    // Input
>+
>+    /**
>+     * @return an array which may be empty but is never null.
>+     */
>+    public static int[] inputGetInputDeviceIds(int sources) {
>+        int[] ids = InputDevice.getDeviceIds();
>+        int[] filtered = new int[ids.length];
>+        int used = 0;
>+        for (int i = 0; i < ids.length; ++i) {
>+            InputDevice device = InputDevice.getDevice(ids[i]);
>+            if ((device != null) && ((device.getSources() & sources) != 0)) {
>+                filtered[used++] = device.getId();
>+            }
>+        }
>+        return Arrays.copyOf(filtered, used);
>+    }
>+            
>+    // Joystick glue code, just a series of stubs that redirect to the SDLJoystickHandler instance
>+    public static boolean handleJoystickMotionEvent(MotionEvent event) {
>+        return mJoystickHandler.handleMotionEvent(event);
>+    }
>+    
>+    public static void pollInputDevices() {
>+        if (SDLActivity.mSDLThread != null) {
>+            mJoystickHandler.pollInputDevices();
>+        }
>+    }
>+    
>+}
>+
>+/**
>+    Simple nativeInit() runnable
>+*/
>+class SDLMain implements Runnable {
>+    @Override
>+    public void run() {
>+        // Runs SDL_main()
>+        SDLActivity.nativeInit();
>+
>+        //Log.v("SDL", "SDL thread terminated");
>+    }
>+}
>+
>+
>+/**
>+    SDLSurface. This is what we draw on, so we need to know when it's created
>+    in order to do anything useful. 
>+
>+    Because of this, that's where we set up the SDL thread
>+*/
>+class SDLSurface extends SurfaceView implements SurfaceHolder.Callback, 
>+    View.OnKeyListener, View.OnTouchListener, SensorEventListener  {
>+
>+    // Sensors
>+    protected static SensorManager mSensorManager;
>+    protected static Display mDisplay;
>+
>+    // Keep track of the surface size to normalize touch events
>+    protected static float mWidth, mHeight;
>+
>+    // Startup    
>+    public SDLSurface(Context context) {
>+        super(context);
>+        getHolder().addCallback(this); 
>+    
>+        setFocusable(true);
>+        setFocusableInTouchMode(true);
>+        requestFocus();
>+        setOnKeyListener(this); 
>+        setOnTouchListener(this);   
>+
>+        mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
>+        mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
>+        
>+        if(Build.VERSION.SDK_INT >= 12) {
>+            setOnGenericMotionListener(new SDLGenericMotionListener_API12());
>+        }
>+
>+        // Some arbitrary defaults to avoid a potential division by zero
>+        mWidth = 1.0f;
>+        mHeight = 1.0f;
>+    }
>+    
>+    public Surface getNativeSurface() {
>+        return getHolder().getSurface();
>+    }
>+
>+    // Called when we have a valid drawing surface
>+    @Override
>+    public void surfaceCreated(SurfaceHolder holder) {
>+        Log.v("SDL", "surfaceCreated()");
>+        holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
>+    }
>+
>+    // Called when we lose the surface
>+    @Override
>+    public void surfaceDestroyed(SurfaceHolder holder) {
>+        Log.v("SDL", "surfaceDestroyed()");
>+        // Call this *before* setting mIsSurfaceReady to 'false'
>+        SDLActivity.handlePause();
>+        SDLActivity.mIsSurfaceReady = false;
>+        SDLActivity.onNativeSurfaceDestroyed();
>+    }
>+
>+    // Called when the surface is resized
>+    @Override
>+    public void surfaceChanged(SurfaceHolder holder,
>+                               int format, int width, int height) {
>+        Log.v("SDL", "surfaceChanged()");
>+
>+        int sdlFormat = 0x15151002; // SDL_PIXELFORMAT_RGB565 by default
>+        switch (format) {
>+        case PixelFormat.A_8:
>+            Log.v("SDL", "pixel format A_8");
>+            break;
>+        case PixelFormat.LA_88:
>+            Log.v("SDL", "pixel format LA_88");
>+            break;
>+        case PixelFormat.L_8:
>+            Log.v("SDL", "pixel format L_8");
>+            break;
>+        case PixelFormat.RGBA_4444:
>+            Log.v("SDL", "pixel format RGBA_4444");
>+            sdlFormat = 0x15421002; // SDL_PIXELFORMAT_RGBA4444
>+            break;
>+        case PixelFormat.RGBA_5551:
>+            Log.v("SDL", "pixel format RGBA_5551");
>+            sdlFormat = 0x15441002; // SDL_PIXELFORMAT_RGBA5551
>+            break;
>+        case PixelFormat.RGBA_8888:
>+            Log.v("SDL", "pixel format RGBA_8888");
>+            sdlFormat = 0x16462004; // SDL_PIXELFORMAT_RGBA8888
>+            break;
>+        case PixelFormat.RGBX_8888:
>+            Log.v("SDL", "pixel format RGBX_8888");
>+            sdlFormat = 0x16261804; // SDL_PIXELFORMAT_RGBX8888
>+            break;
>+        case PixelFormat.RGB_332:
>+            Log.v("SDL", "pixel format RGB_332");
>+            sdlFormat = 0x14110801; // SDL_PIXELFORMAT_RGB332
>+            break;
>+        case PixelFormat.RGB_565:
>+            Log.v("SDL", "pixel format RGB_565");
>+            sdlFormat = 0x15151002; // SDL_PIXELFORMAT_RGB565
>+            break;
>+        case PixelFormat.RGB_888:
>+            Log.v("SDL", "pixel format RGB_888");
>+            // Not sure this is right, maybe SDL_PIXELFORMAT_RGB24 instead?
>+            sdlFormat = 0x16161804; // SDL_PIXELFORMAT_RGB888
>+            break;
>+        default:
>+            Log.v("SDL", "pixel format unknown " + format);
>+            break;
>+        }
>+
>+        mWidth = width;
>+        mHeight = height;
>+        SDLActivity.onNativeResize(width, height, sdlFormat);
>+        Log.v("SDL", "Window size:" + width + "x"+height);
>+
>+        // Set mIsSurfaceReady to 'true' *before* making a call to handleResume
>+        SDLActivity.mIsSurfaceReady = true;
>+        SDLActivity.onNativeSurfaceChanged();
>+
>+
>+        if (SDLActivity.mSDLThread == null) {
>+            // This is the entry point to the C app.
>+            // Start up the C app thread and enable sensor input for the first time
>+
>+            SDLActivity.mSDLThread = new Thread(new SDLMain(), "SDLThread");
>+            enableSensor(Sensor.TYPE_ACCELEROMETER, true);
>+            SDLActivity.mSDLThread.start();
>+            
>+            // Set up a listener thread to catch when the native thread ends
>+            new Thread(new Runnable(){
>+                @Override
>+                public void run(){
>+                    try {
>+                        SDLActivity.mSDLThread.join();
>+                    }
>+                    catch(Exception e){}
>+                    finally{ 
>+                        // Native thread has finished
>+                        if (! SDLActivity.mExitCalledFromJava) {
>+                            SDLActivity.handleNativeExit();
>+                        }
>+                    }
>+                }
>+            }).start();
>+        }
>+    }
>+
>+    // unused
>+    @Override
>+    public void onDraw(Canvas canvas) {}
>+
>+
>+    // Key events
>+    @Override
>+    public boolean onKey(View  v, int keyCode, KeyEvent event) {
>+        // Dispatch the different events depending on where they come from
>+        // Some SOURCE_DPAD or SOURCE_GAMEPAD are also SOURCE_KEYBOARD
>+        // So, we try to process them as DPAD or GAMEPAD events first, if that fails we try them as KEYBOARD
>+        
>+        if ( (event.getSource() & 0x00000401) != 0 || /* API 12: SOURCE_GAMEPAD */
>+                   (event.getSource() & InputDevice.SOURCE_DPAD) != 0 ) {
>+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+                if (SDLActivity.onNativePadDown(event.getDeviceId(), keyCode) == 0) {
>+                    return true;
>+                }
>+            } else if (event.getAction() == KeyEvent.ACTION_UP) {
>+                if (SDLActivity.onNativePadUp(event.getDeviceId(), keyCode) == 0) {
>+                    return true;
>+                }
>+            }
>+        }
>+        
>+        if( (event.getSource() & InputDevice.SOURCE_KEYBOARD) != 0) {
>+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+                //Log.v("SDL", "key down: " + keyCode);
>+                SDLActivity.onNativeKeyDown(keyCode);
>+                return true;
>+            }
>+            else if (event.getAction() == KeyEvent.ACTION_UP) {
>+                //Log.v("SDL", "key up: " + keyCode);
>+                SDLActivity.onNativeKeyUp(keyCode);
>+                return true;
>+            }
>+        }
>+        
>+        return false;
>+    }
>+
>+    // Touch events
>+    @Override
>+    public boolean onTouch(View v, MotionEvent event) {
>+        /* Ref: http://developer.android.com/training/gestures/multi.html */
>+        final int touchDevId = event.getDeviceId();
>+        final int pointerCount = event.getPointerCount();
>+        int action = event.getActionMasked();
>+        int pointerFingerId;
>+        int i = -1;
>+        float x,y,p;
>+        
>+        switch(action) {
>+            case MotionEvent.ACTION_MOVE:
>+                for (i = 0; i < pointerCount; i++) {
>+                    pointerFingerId = event.getPointerId(i);
>+                    x = event.getX(i) / mWidth;
>+                    y = event.getY(i) / mHeight;
>+                    p = event.getPressure(i);
>+                    SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
>+                }
>+                break;
>+            
>+            case MotionEvent.ACTION_UP:
>+            case MotionEvent.ACTION_DOWN:
>+                // Primary pointer up/down, the index is always zero
>+                i = 0;
>+            case MotionEvent.ACTION_POINTER_UP:
>+            case MotionEvent.ACTION_POINTER_DOWN:
>+                // Non primary pointer up/down
>+                if (i == -1) {
>+                    i = event.getActionIndex();
>+                }
>+                
>+                pointerFingerId = event.getPointerId(i);
>+                x = event.getX(i) / mWidth;
>+                y = event.getY(i) / mHeight;
>+                p = event.getPressure(i);
>+                SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
>+                break;
>+            
>+            default:
>+                break;
>+        }
>+
>+        return true;
>+   } 
>+
>+    // Sensor events
>+    public void enableSensor(int sensortype, boolean enabled) {
>+        // TODO: This uses getDefaultSensor - what if we have >1 accels?
>+        if (enabled) {
>+            mSensorManager.registerListener(this, 
>+                            mSensorManager.getDefaultSensor(sensortype), 
>+                            SensorManager.SENSOR_DELAY_GAME, null);
>+        } else {
>+            mSensorManager.unregisterListener(this, 
>+                            mSensorManager.getDefaultSensor(sensortype));
>+        }
>+    }
>+    
>+    @Override
>+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
>+        // TODO
>+    }
>+
>+    @Override
>+    public void onSensorChanged(SensorEvent event) {
>+        if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
>+            float x, y;
>+            switch (mDisplay.getRotation()) {
>+                case Surface.ROTATION_90:
>+                    x = -event.values[1];
>+                    y = event.values[0];
>+                    break;
>+                case Surface.ROTATION_270:
>+                    x = event.values[1];
>+                    y = -event.values[0];
>+                    break;
>+                case Surface.ROTATION_180:
>+                    x = -event.values[1];
>+                    y = -event.values[0];
>+                    break;
>+                default:
>+                    x = event.values[0];
>+                    y = event.values[1];
>+                    break;
>+            }
>+            SDLActivity.onNativeAccel(-x / SensorManager.GRAVITY_EARTH,
>+                                      y / SensorManager.GRAVITY_EARTH,
>+                                      event.values[2] / SensorManager.GRAVITY_EARTH - 1);
>+        }
>+    }    
>+}
>+
>+/* This is a fake invisible editor view that receives the input and defines the
>+ * pan&scan region
>+ */
>+class DummyEdit extends View implements View.OnKeyListener {
>+    InputConnection ic;
>+
>+    public DummyEdit(Context context) {
>+        super(context);
>+        setFocusableInTouchMode(true);
>+        setFocusable(true);
>+        setOnKeyListener(this);
>+    }
>+
>+    @Override
>+    public boolean onCheckIsTextEditor() {
>+        return true;
>+    }
>+
>+    @Override
>+    public boolean onKey(View v, int keyCode, KeyEvent event) {
>+
>+        // This handles the hardware keyboard input
>+        if (event.isPrintingKey()) {
>+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+                ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1);
>+            }
>+            return true;
>+        }
>+
>+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+            SDLActivity.onNativeKeyDown(keyCode);
>+            return true;
>+        } else if (event.getAction() == KeyEvent.ACTION_UP) {
>+            SDLActivity.onNativeKeyUp(keyCode);
>+            return true;
>+        }
>+
>+        return false;
>+    }
>+        
>+    //
>+    @Override
>+    public boolean onKeyPreIme (int keyCode, KeyEvent event) {
>+        // As seen on StackOverflow: http://stackoverflow.com/questions/7634346/keyboard-hide-event
>+        // FIXME: Discussion at http://bugzilla.libsdl.org/show_bug.cgi?id=1639
>+        // FIXME: This is not a 100% effective solution to the problem of detecting if the keyboard is showing or not
>+        // FIXME: A more effective solution would be to change our Layout from AbsoluteLayout to Relative or Linear
>+        // FIXME: And determine the keyboard presence doing this: http://stackoverflow.com/questions/2150078/how-to-check-visibility-of-software-keyboard-in-android
>+        // FIXME: An even more effective way would be if Android provided this out of the box, but where would the fun be in that :)
>+        if (event.getAction()==KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
>+            if (SDLActivity.mTextEdit != null && SDLActivity.mTextEdit.getVisibility() == View.VISIBLE) {
>+                SDLActivity.onNativeKeyboardFocusLost();
>+            }
>+        }
>+        return super.onKeyPreIme(keyCode, event);
>+    }
>+
>+    @Override
>+    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
>+        ic = new SDLInputConnection(this, true);
>+
>+        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
>+                | 33554432 /* API 11: EditorInfo.IME_FLAG_NO_FULLSCREEN */;
>+
>+        return ic;
>+    }
>+}
>+
>+class SDLInputConnection extends BaseInputConnection {
>+
>+    public SDLInputConnection(View targetView, boolean fullEditor) {
>+        super(targetView, fullEditor);
>+
>+    }
>+
>+    @Override
>+    public boolean sendKeyEvent(KeyEvent event) {
>+
>+        /*
>+         * This handles the keycodes from soft keyboard (and IME-translated
>+         * input from hardkeyboard)
>+         */
>+        int keyCode = event.getKeyCode();
>+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+            if (event.isPrintingKey()) {
>+                commitText(String.valueOf((char) event.getUnicodeChar()), 1);
>+            }
>+            SDLActivity.onNativeKeyDown(keyCode);
>+            return true;
>+        } else if (event.getAction() == KeyEvent.ACTION_UP) {
>+
>+            SDLActivity.onNativeKeyUp(keyCode);
>+            return true;
>+        }
>+        return super.sendKeyEvent(event);
>+    }
>+
>+    @Override
>+    public boolean commitText(CharSequence text, int newCursorPosition) {
>+
>+        nativeCommitText(text.toString(), newCursorPosition);
>+
>+        return super.commitText(text, newCursorPosition);
>+    }
>+
>+    @Override
>+    public boolean setComposingText(CharSequence text, int newCursorPosition) {
>+
>+        nativeSetComposingText(text.toString(), newCursorPosition);
>+
>+        return super.setComposingText(text, newCursorPosition);
>+    }
>+
>+    public native void nativeCommitText(String text, int newCursorPosition);
>+
>+    public native void nativeSetComposingText(String text, int newCursorPosition);
>+
>+    @Override
>+    public boolean deleteSurroundingText(int beforeLength, int afterLength) {       
>+        // Workaround to capture backspace key. Ref: http://stackoverflow.com/questions/14560344/android-backspace-in-webview-baseinputconnection
>+        if (beforeLength == 1 && afterLength == 0) {
>+            // backspace
>+            return super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL))
>+                && super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL));
>+        }
>+
>+        return super.deleteSurroundingText(beforeLength, afterLength);
>+    }
>+}
>+
>+/* A null joystick handler for API level < 12 devices (the accelerometer is handled separately) */
>+class SDLJoystickHandler {
>+    
>+    public boolean handleMotionEvent(MotionEvent event) {
>+        return false;
>+    }
>+    
>+    public void pollInputDevices() {
>+    }
>+}
>+
>+/* Actual joystick functionality available for API >= 12 devices */
>+class SDLJoystickHandler_API12 extends SDLJoystickHandler {
>+  
>+    class SDLJoystick {
>+        public int device_id;
>+        public String name;
>+        public ArrayList<InputDevice.MotionRange> axes;
>+    }
>+    
>+    private ArrayList<SDLJoystick> mJoysticks;
>+    
>+    public SDLJoystickHandler_API12() {
>+       
>+        mJoysticks = new ArrayList<SDLJoystick>();
>+    }
>+
>+    @Override
>+    public void pollInputDevices() {
>+        int[] deviceIds = InputDevice.getDeviceIds();
>+        // It helps processing the device ids in reverse order
>+        // For example, in the case of the XBox 360 wireless dongle,
>+        // so the first controller seen by SDL matches what the receiver
>+        // considers to be the first controller
>+        
>+        for(int i=deviceIds.length-1; i>-1; i--) {
>+            SDLJoystick joystick = getJoystick(deviceIds[i]);
>+            if (joystick == null) {
>+                joystick = new SDLJoystick();
>+                InputDevice joystickDevice = InputDevice.getDevice(deviceIds[i]);
>+                if( (joystickDevice.getSources() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
>+                    joystick.device_id = deviceIds[i];
>+                    joystick.name = joystickDevice.getName();
>+                    joystick.axes = new ArrayList<InputDevice.MotionRange>();
>+                    
>+                    for (InputDevice.MotionRange range : joystickDevice.getMotionRanges()) {
>+                         if ( (range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
>+                            joystick.axes.add(range);
>+                         }
>+                    }
>+                    
>+                    mJoysticks.add(joystick);
>+                    SDLActivity.nativeAddJoystick(joystick.device_id, joystick.name, 0, -1, joystick.axes.size(), 0, 0);
>+                }
>+            }
>+        }
>+        
>+        /* Check removed devices */
>+        ArrayList<Integer> removedDevices = new ArrayList<Integer>();
>+        for(int i=0; i < mJoysticks.size(); i++) {
>+            int device_id = mJoysticks.get(i).device_id;
>+            int j;
>+            for (j=0; j < deviceIds.length; j++) {
>+                if (device_id == deviceIds[j]) break;
>+            }
>+            if (j == deviceIds.length) {
>+                removedDevices.add(device_id);
>+            }
>+        }
>+            
>+        for(int i=0; i < removedDevices.size(); i++) {
>+            int device_id = removedDevices.get(i);
>+            SDLActivity.nativeRemoveJoystick(device_id);
>+            for (int j=0; j < mJoysticks.size(); j++) {
>+                if (mJoysticks.get(j).device_id == device_id) {
>+                    mJoysticks.remove(j);
>+                    break;
>+                }
>+            }
>+        }        
>+    }
>+    
>+    protected SDLJoystick getJoystick(int device_id) {
>+        for(int i=0; i < mJoysticks.size(); i++) {
>+            if (mJoysticks.get(i).device_id == device_id) {
>+                return mJoysticks.get(i);
>+            }
>+        }
>+        return null;
>+    }   
>+    
>+    @Override        
>+    public boolean handleMotionEvent(MotionEvent event) {
>+        if ( (event.getSource() & InputDevice.SOURCE_JOYSTICK) != 0) {
>+            int actionPointerIndex = event.getActionIndex();
>+            int action = event.getActionMasked();
>+            switch(action) {
>+                case MotionEvent.ACTION_MOVE:
>+                    SDLJoystick joystick = getJoystick(event.getDeviceId());
>+                    if ( joystick != null ) {
>+                        for (int i = 0; i < joystick.axes.size(); i++) {
>+                            InputDevice.MotionRange range = joystick.axes.get(i);
>+                            /* Normalize the value to -1...1 */
>+                            float value = ( event.getAxisValue( range.getAxis(), actionPointerIndex) - range.getMin() ) / range.getRange() * 2.0f - 1.0f;
>+                            SDLActivity.onNativeJoy(joystick.device_id, i, value );
>+                        }                       
>+                    }
>+                    break;
>+                default:
>+                    break;
>+            }
>+        }
>+        return true;
>+    }            
>+}
>+
>+class SDLGenericMotionListener_API12 implements View.OnGenericMotionListener {
>+    // Generic Motion (mouse hover, joystick...) events go here
>+    // We only have joysticks yet
>+    @Override
>+    public boolean onGenericMotion(View v, MotionEvent event) {
>+        return SDLActivity.handleJoystickMotionEvent(event);
>+    }
>+}
>diff -r 1b62b081a83b android/testgles/.classpath
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testgles/.classpath	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,9 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<classpath>
>+	<classpathentry kind="src" path="src"/>
>+	<classpathentry kind="src" path="gen"/>
>+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
>+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
>+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
>+	<classpathentry kind="output" path="bin/classes"/>
>+</classpath>
>diff -r 1b62b081a83b android/testgles/.project
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testgles/.project	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,33 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<projectDescription>
>+	<name>Test GLES</name>
>+	<comment></comment>
>+	<projects>
>+	</projects>
>+	<buildSpec>
>+		<buildCommand>
>+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>org.eclipse.jdt.core.javabuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+	</buildSpec>
>+	<natures>
>+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
>+		<nature>org.eclipse.jdt.core.javanature</nature>
>+	</natures>
>+</projectDescription>
>diff -r 1b62b081a83b android/testgles/.settings/org.eclipse.ltk.core.refactoring.prefs
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testgles/.settings/org.eclipse.ltk.core.refactoring.prefs	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,2 @@
>+eclipse.preferences.version=1
>+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
>diff -r 1b62b081a83b android/testgles/AndroidManifest.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testgles/AndroidManifest.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,42 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+
>+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
>+      package="org.libsdl.testgles"
>+      android:versionCode="1"
>+      android:versionName="1.0"
>+      android:installLocation="auto">
>+
>+    
>+    <application android:label="@string/app_name"
>+                 android:icon="@drawable/ic_launcher"
>+                 android:allowBackup="true"
>+                 android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
>+        <activity android:name="SDLActivity"
>+                  android:label="@string/app_name">
>+            <intent-filter>
>+                <action android:name="android.intent.action.MAIN" />
>+                <category android:name="android.intent.category.LAUNCHER" />
>+            </intent-filter>
>+        </activity>
>+            
>+    </application>
>+
>+    
>+    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="16" />
>+
>+    
>+    <uses-feature android:glEsVersion="0x00020000" /> 
>+
>+    
>+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 
>+</manifest> 
>diff -r 1b62b081a83b android/testgles/ant.properties
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testgles/ant.properties	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,17 @@
>+# This file is used to override default values used by the Ant build system.
>+#
>+# This file must be checked into Version Control Systems, as it is
>+# integral to the build system of your project.
>+
>+# This file is only used by the Ant script.
>+
>+# You can use this to override default values such as
>+#  'source.dir' for the location of your java source folder and
>+#  'out.dir' for the location of your output folder.
>+
>+# You can also use it define how the release builds are signed by declaring
>+# the following properties:
>+#  'key.store' for the location of your keystore and
>+#  'key.alias' for the name of the key to use.
>+# The password will be asked during the build when you use the 'release' target.
>+
>diff -r 1b62b081a83b android/testgles/build.properties
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testgles/build.properties	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,17 @@
>+# This file is used to override default values used by the Ant build system.
>+# 
>+# This file must be checked in Version Control Systems, as it is
>+# integral to the build system of your project.
>+
>+# This file is only used by the Ant script.
>+
>+# You can use this to override default values such as
>+#  'source.dir' for the location of your java source folder and
>+#  'out.dir' for the location of your output folder.
>+
>+# You can also use it define how the release builds are signed by declaring
>+# the following properties:
>+#  'key.store' for the location of your keystore and
>+#  'key.alias' for the name of the key to use.
>+# The password will be asked during the build when you use the 'release' target.
>+
>diff -r 1b62b081a83b android/testgles/build.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testgles/build.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,93 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+
>+<project name="Test GLES" default="help">
>+
>+    
>+    <property file="local.properties" />
>+
>+    
>+    <property file="ant.properties" />
>+
>+    
>+    <property environment="env" />
>+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
>+        <isset property="env.ANDROID_HOME" />
>+    </condition>
>+
>+    
>+    <loadproperties srcFile="project.properties" />
>+
>+    
>+    <fail
>+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
>+            unless="sdk.dir"
>+    />
>+
>+    
>+    <import file="custom_rules.xml" optional="true" />
>+
>+    
>+    
>+    <import file="${sdk.dir}/tools/ant/build.xml" />
>+
>+</project>
>diff -r 1b62b081a83b android/testgles/clean.sh
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testgles/clean.sh	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,4 @@
>+rm -rf bin
>+rm -rf gen
>+rm -rf obj
>+rm -rf libs
>diff -r 1b62b081a83b android/testgles/default.properties
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testgles/default.properties	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,11 @@
>+# This file is automatically generated by Android Tools.
>+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
>+# 
>+# This file must be checked in Version Control Systems.
>+# 
>+# To customize properties used by the Ant build system use,
>+# "build.properties", and override values to adapt the script to your
>+# project structure.
>+
>+# Project target.
>+target=android-7
>diff -r 1b62b081a83b android/testgles/jni/Android.mk
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testgles/jni/Android.mk	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,1 @@
>+include $(call all-subdir-makefiles)
>diff -r 1b62b081a83b android/testgles/jni/Application.mk
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testgles/jni/Application.mk	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,6 @@
>+APP_ABI := armeabi x86
>+APP_PLATFORM := android-9
>+
>+# Uncomment this if you're using STL in your project
>+# See CPLUSPLUS-SUPPORT.html in the NDK documentation for more information
>+# APP_STL := stlport_static 
>diff -r 1b62b081a83b android/testgles/jni/SDL/Android.mk
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testgles/jni/SDL/Android.mk	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,52 @@
>+LOCAL_PATH := $(SDL2_HOME)
>+
>+###########################
>+#
>+# SDL shared library
>+#
>+###########################
>+
>+include $(CLEAR_VARS)
>+
>+LOCAL_MODULE := SDL2
>+
>+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
>+
>+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
>+
>+LOCAL_SRC_FILES := \
>+	$(subst $(LOCAL_PATH)/,, \
>+	$(wildcard $(LOCAL_PATH)/src/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/audio/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/audio/android/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/audio/dummy/*.c) \
>+	$(LOCAL_PATH)/src/atomic/SDL_atomic.c \
>+	$(LOCAL_PATH)/src/atomic/SDL_spinlock.c.arm \
>+	$(wildcard $(LOCAL_PATH)/src/core/android/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/cpuinfo/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/dynapi/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/events/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/file/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/haptic/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/haptic/dummy/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/joystick/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/joystick/android/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/power/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/power/android/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/filesystem/dummy/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/render/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/render/*/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/thread/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/thread/pthread/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/timer/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/timer/unix/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/video/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/video/android/*.c))
>+
>+LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DSDL_PREFIX=org_libsdl_testgles
>+LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
>+
>+
>+include $(BUILD_SHARED_LIBRARY)
>diff -r 1b62b081a83b android/testgles/jni/src/Android.mk
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testgles/jni/src/Android.mk	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,22 @@
>+LOCAL_PATH := $(call my-dir)
>+
>+include $(CLEAR_VARS)
>+
>+LOCAL_MODULE := main
>+
>+SDL_PATH := ../../../..
>+
>+LOCAL_C_INCLUDES := $(SDL_PATH)/include
>+
>+# Add your application source files here...
>+LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
>+	$(SDL_PATH)/test/testgles.c \
>+	$(SDL_PATH)/src/test/SDL_test_common.c
>+
>+LOCAL_CFLAGS += -DSDL_PREFIX=org_libsdl_testgles
>+
>+LOCAL_SHARED_LIBRARIES := SDL2
>+
>+LOCAL_LDLIBS := -lGLESv1_CM -llog
>+
>+include $(BUILD_SHARED_LIBRARY)
>diff -r 1b62b081a83b android/testgles/lint.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testgles/lint.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,3 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<lint>
>+</lint>
>\ No newline at end of file
>diff -r 1b62b081a83b android/testgles/proguard-project.txt
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testgles/proguard-project.txt	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,20 @@
>+# To enable ProGuard in your project, edit project.properties
>+# to define the proguard.config property as described in that file.
>+#
>+# Add project specific ProGuard rules here.
>+# By default, the flags in this file are appended to flags specified
>+# in ${sdk.dir}/tools/proguard/proguard-android.txt
>+# You can edit the include path and order by changing the ProGuard
>+# include property in project.properties.
>+#
>+# For more details, see
>+#   http://developer.android.com/guide/developing/tools/proguard.html
>+
>+# Add any project specific keep options here:
>+
>+# If your project uses WebView with JS, uncomment the following
>+# and specify the fully qualified class name to the JavaScript interface
>+# class:
>+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
>+#   public *;
>+#}
>diff -r 1b62b081a83b android/testgles/project.properties
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testgles/project.properties	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,14 @@
>+# This file is automatically generated by Android Tools.
>+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
>+#
>+# This file must be checked in Version Control Systems.
>+#
>+# To customize properties used by the Ant build system edit
>+# "ant.properties", and override values to adapt the script to your
>+# project structure.
>+#
>+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
>+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
>+
>+# Project target.
>+target=android-18
>diff -r 1b62b081a83b android/testgles/res/drawable-hdpi/ic_launcher.png
>Binary file android/testgles/res/drawable-hdpi/ic_launcher.png has changed
>diff -r 1b62b081a83b android/testgles/res/drawable-mdpi/ic_launcher.png
>Binary file android/testgles/res/drawable-mdpi/ic_launcher.png has changed
>diff -r 1b62b081a83b android/testgles/res/drawable-xhdpi/ic_launcher.png
>Binary file android/testgles/res/drawable-xhdpi/ic_launcher.png has changed
>diff -r 1b62b081a83b android/testgles/res/drawable-xxhdpi/ic_launcher.png
>Binary file android/testgles/res/drawable-xxhdpi/ic_launcher.png has changed
>diff -r 1b62b081a83b android/testgles/res/layout/main.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testgles/res/layout/main.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,13 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
>+    android:orientation="vertical"
>+    android:layout_width="fill_parent"
>+    android:layout_height="fill_parent"
>+    >
>+<TextView  
>+    android:layout_width="fill_parent" 
>+    android:layout_height="wrap_content" 
>+    android:text="Hello World, SDLActivity"
>+    />
>+</LinearLayout>
>+
>diff -r 1b62b081a83b android/testgles/res/values/strings.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testgles/res/values/strings.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,4 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+<resources>
>+    <string name="app_name">Test GLES</string>
>+</resources>
>diff -r 1b62b081a83b android/testgles/src/org/libsdl/testgles/SDLActivity.java
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testgles/src/org/libsdl/testgles/SDLActivity.java	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,1029 @@
>+package org.libsdl.testgles;
>+
>+import java.util.ArrayList;
>+import java.util.Arrays;
>+
>+import android.app.*;
>+import android.content.*;
>+import android.view.*;
>+import android.view.inputmethod.BaseInputConnection;
>+import android.view.inputmethod.EditorInfo;
>+import android.view.inputmethod.InputConnection;
>+import android.view.inputmethod.InputMethodManager;
>+import android.widget.AbsoluteLayout;
>+import android.os.*;
>+import android.util.Log;
>+import android.graphics.*;
>+import android.media.*;
>+import android.hardware.*;
>+
>+
>+/**
>+    SDL Activity
>+*/
>+public class SDLActivity extends Activity {
>+    private static final String TAG = "SDL";
>+
>+    // Keep track of the paused state
>+    public static boolean mIsPaused = false, mIsSurfaceReady = false, mHasFocus = true;
>+    public static boolean mExitCalledFromJava;
>+
>+    // Main components
>+    protected static SDLActivity mSingleton;
>+    protected static SDLSurface mSurface;
>+    protected static View mTextEdit;
>+    protected static ViewGroup mLayout;
>+    protected static SDLJoystickHandler mJoystickHandler;
>+
>+    // This is what SDL runs in. It invokes SDL_main(), eventually
>+    protected static Thread mSDLThread;
>+    
>+    // Audio
>+    protected static Thread mAudioThread;
>+    protected static AudioTrack mAudioTrack;
>+
>+    // Load the .so
>+    static {
>+        System.loadLibrary("SDL2");
>+        //System.loadLibrary("SDL2_image");
>+        //System.loadLibrary("SDL2_mixer");
>+        //System.loadLibrary("SDL2_net");
>+        //System.loadLibrary("SDL2_ttf");
>+        System.loadLibrary("main");
>+    }
>+
>+    // Setup
>+    @Override
>+    protected void onCreate(Bundle savedInstanceState) {
>+        //Log.v("SDL", "onCreate()");
>+        super.onCreate(savedInstanceState);
>+        
>+        // So we can call stuff from static callbacks
>+        mSingleton = this;
>+
>+        // Set up the surface
>+        mSurface = new SDLSurface(getApplication());
>+        
>+        // Make sure this variable is initialized here!
>+        mExitCalledFromJava = false;
>+        
>+        if(Build.VERSION.SDK_INT >= 12) {
>+            mJoystickHandler = new SDLJoystickHandler_API12();
>+        }
>+        else {
>+            mJoystickHandler = new SDLJoystickHandler();
>+        }
>+
>+        mLayout = new AbsoluteLayout(this);
>+        mLayout.addView(mSurface);
>+
>+        setContentView(mLayout);
>+    }
>+
>+    // Events
>+    @Override
>+    protected void onPause() {
>+        Log.v("SDL", "onPause()");
>+        super.onPause();
>+        SDLActivity.handlePause();
>+    }
>+
>+    @Override
>+    protected void onResume() {
>+        Log.v("SDL", "onResume()");
>+        super.onResume();
>+        SDLActivity.handleResume();
>+    }
>+
>+
>+    @Override
>+    public void onWindowFocusChanged(boolean hasFocus) {
>+        super.onWindowFocusChanged(hasFocus);
>+        Log.v("SDL", "onWindowFocusChanged(): " + hasFocus);
>+
>+        SDLActivity.mHasFocus = hasFocus;
>+        if (hasFocus) {
>+            SDLActivity.handleResume();
>+        }
>+    }
>+
>+    @Override
>+    public void onLowMemory() {
>+        Log.v("SDL", "onLowMemory()");
>+        super.onLowMemory();
>+        SDLActivity.nativeLowMemory();
>+    }
>+
>+    @Override
>+    protected void onDestroy() {
>+        super.onDestroy();
>+        Log.v("SDL", "onDestroy()");
>+        // Send a quit message to the application
>+        SDLActivity.mExitCalledFromJava = true;
>+        SDLActivity.nativeQuit();
>+
>+        // Now wait for the SDL thread to quit
>+        if (SDLActivity.mSDLThread != null) {
>+            try {
>+                SDLActivity.mSDLThread.join();
>+            } catch(Exception e) {
>+                Log.v("SDL", "Problem stopping thread: " + e);
>+            }
>+            SDLActivity.mSDLThread = null;
>+
>+            //Log.v("SDL", "Finished waiting for SDL thread");
>+        }
>+    }
>+
>+    @Override
>+    public boolean dispatchKeyEvent(KeyEvent event) {
>+        int keyCode = event.getKeyCode();
>+        // Ignore certain special keys so they're handled by Android
>+        if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
>+            keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
>+            keyCode == KeyEvent.KEYCODE_CAMERA ||
>+            keyCode == 168 || /* API 11: KeyEvent.KEYCODE_ZOOM_IN */
>+            keyCode == 169 /* API 11: KeyEvent.KEYCODE_ZOOM_OUT */
>+            ) {
>+            return false;
>+        }
>+        return super.dispatchKeyEvent(event);
>+    }
>+
>+    /** Called by onPause or surfaceDestroyed. Even if surfaceDestroyed
>+     *  is the first to be called, mIsSurfaceReady should still be set
>+     *  to 'true' during the call to onPause (in a usual scenario).
>+     */
>+    public static void handlePause() {
>+        if (!SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady) {
>+            SDLActivity.mIsPaused = true;
>+            SDLActivity.nativePause();
>+            mSurface.enableSensor(Sensor.TYPE_ACCELEROMETER, false);
>+        }
>+    }
>+
>+    /** Called by onResume or surfaceCreated. An actual resume should be done only when the surface is ready.
>+     * Note: Some Android variants may send multiple surfaceChanged events, so we don't need to resume
>+     * every time we get one of those events, only if it comes after surfaceDestroyed
>+     */
>+    public static void handleResume() {
>+        if (SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady && SDLActivity.mHasFocus) {
>+            SDLActivity.mIsPaused = false;
>+            SDLActivity.nativeResume();
>+            mSurface.enableSensor(Sensor.TYPE_ACCELEROMETER, true);
>+        }
>+    }
>+        
>+    /* The native thread has finished */
>+    public static void handleNativeExit() {
>+        SDLActivity.mSDLThread = null;
>+        mSingleton.finish();
>+    }
>+
>+
>+    // Messages from the SDLMain thread
>+    static final int COMMAND_CHANGE_TITLE = 1;
>+    static final int COMMAND_UNUSED = 2;
>+    static final int COMMAND_TEXTEDIT_HIDE = 3;
>+
>+    protected static final int COMMAND_USER = 0x8000;
>+
>+    /**
>+     * This method is called by SDL if SDL did not handle a message itself.
>+     * This happens if a received message contains an unsupported command.
>+     * Method can be overwritten to handle Messages in a different class.
>+     * @param command the command of the message.
>+     * @param param the parameter of the message. May be null.
>+     * @return if the message was handled in overridden method.
>+     */
>+    protected boolean onUnhandledMessage(int command, Object param) {
>+        return false;
>+    }
>+
>+    /**
>+     * A Handler class for Messages from native SDL applications.
>+     * It uses current Activities as target (e.g. for the title).
>+     * static to prevent implicit references to enclosing object.
>+     */
>+    protected static class SDLCommandHandler extends Handler {
>+        @Override
>+        public void handleMessage(Message msg) {
>+            Context context = getContext();
>+            if (context == null) {
>+                Log.e(TAG, "error handling message, getContext() returned null");
>+                return;
>+            }
>+            switch (msg.arg1) {
>+            case COMMAND_CHANGE_TITLE:
>+                if (context instanceof Activity) {
>+                    ((Activity) context).setTitle((String)msg.obj);
>+                } else {
>+                    Log.e(TAG, "error handling message, getContext() returned no Activity");
>+                }
>+                break;
>+            case COMMAND_TEXTEDIT_HIDE:
>+                if (mTextEdit != null) {
>+                    mTextEdit.setVisibility(View.GONE);
>+
>+                    InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
>+                    imm.hideSoftInputFromWindow(mTextEdit.getWindowToken(), 0);
>+                }
>+                break;
>+
>+            default:
>+                if ((context instanceof SDLActivity) && !((SDLActivity) context).onUnhandledMessage(msg.arg1, msg.obj)) {
>+                    Log.e(TAG, "error handling message, command is " + msg.arg1);
>+                }
>+            }
>+        }
>+    }
>+
>+    // Handler for the messages
>+    Handler commandHandler = new SDLCommandHandler();
>+
>+    // Send a message from the SDLMain thread
>+    boolean sendCommand(int command, Object data) {
>+        Message msg = commandHandler.obtainMessage();
>+        msg.arg1 = command;
>+        msg.obj = data;
>+        return commandHandler.sendMessage(msg);
>+    }
>+
>+    // C functions we call
>+    public static native void nativeInit();
>+    public static native void nativeLowMemory();
>+    public static native void nativeQuit();
>+    public static native void nativePause();
>+    public static native void nativeResume();
>+    public static native void onNativeResize(int x, int y, int format);
>+    public static native int onNativePadDown(int device_id, int keycode);
>+    public static native int onNativePadUp(int device_id, int keycode);
>+    public static native void onNativeJoy(int device_id, int axis,
>+                                          float value);
>+    public static native void onNativeKeyDown(int keycode);
>+    public static native void onNativeKeyUp(int keycode);
>+    public static native void onNativeKeyboardFocusLost();
>+    public static native void onNativeTouch(int touchDevId, int pointerFingerId,
>+                                            int action, float x, 
>+                                            float y, float p);
>+    public static native void onNativeAccel(float x, float y, float z);
>+    public static native void onNativeSurfaceChanged();
>+    public static native void onNativeSurfaceDestroyed();
>+    public static native void nativeFlipBuffers();
>+    public static native int nativeAddJoystick(int device_id, String name, 
>+                                               int is_accelerometer, int nbuttons, 
>+                                               int naxes, int nhats, int nballs);
>+    public static native int nativeRemoveJoystick(int device_id);
>+
>+    public static void flipBuffers() {
>+        SDLActivity.nativeFlipBuffers();
>+    }
>+
>+    public static boolean setActivityTitle(String title) {
>+        // Called from SDLMain() thread and can't directly affect the view
>+        return mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title);
>+    }
>+
>+    public static boolean sendMessage(int command, int param) {
>+        return mSingleton.sendCommand(command, Integer.valueOf(param));
>+    }
>+
>+    public static Context getContext() {
>+        return mSingleton;
>+    }
>+
>+    /**
>+     * @return result of getSystemService(name) but executed on UI thread.
>+     */
>+    public Object getSystemServiceFromUiThread(final String name) {
>+        final Object lock = new Object();
>+        final Object[] results = new Object[2]; // array for writable variables
>+        synchronized (lock) {
>+            runOnUiThread(new Runnable() {
>+                @Override
>+                public void run() {
>+                    synchronized (lock) {
>+                        results[0] = getSystemService(name);
>+                        results[1] = Boolean.TRUE;
>+                        lock.notify();
>+                    }
>+                }
>+            });
>+            if (results[1] == null) {
>+                try {
>+                    lock.wait();
>+                } catch (InterruptedException ex) {
>+                    ex.printStackTrace();
>+                }
>+            }
>+        }
>+        return results[0];
>+    }
>+
>+    static class ShowTextInputTask implements Runnable {
>+        /*
>+         * This is used to regulate the pan&scan method to have some offset from
>+         * the bottom edge of the input region and the top edge of an input
>+         * method (soft keyboard)
>+         */
>+        static final int HEIGHT_PADDING = 15;
>+
>+        public int x, y, w, h;
>+
>+        public ShowTextInputTask(int x, int y, int w, int h) {
>+            this.x = x;
>+            this.y = y;
>+            this.w = w;
>+            this.h = h;
>+        }
>+
>+        @Override
>+        public void run() {
>+            AbsoluteLayout.LayoutParams params = new AbsoluteLayout.LayoutParams(
>+                    w, h + HEIGHT_PADDING, x, y);
>+
>+            if (mTextEdit == null) {
>+                mTextEdit = new DummyEdit(getContext());
>+
>+                mLayout.addView(mTextEdit, params);
>+            } else {
>+                mTextEdit.setLayoutParams(params);
>+            }
>+
>+            mTextEdit.setVisibility(View.VISIBLE);
>+            mTextEdit.requestFocus();
>+
>+            InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
>+            imm.showSoftInput(mTextEdit, 0);
>+        }
>+    }
>+
>+    public static boolean showTextInput(int x, int y, int w, int h) {
>+        // Transfer the task to the main thread as a Runnable
>+        return mSingleton.commandHandler.post(new ShowTextInputTask(x, y, w, h));
>+    }
>+            
>+    public static Surface getNativeSurface() {
>+        return SDLActivity.mSurface.getNativeSurface();
>+    }
>+
>+    // Audio
>+    public static int audioInit(int sampleRate, boolean is16Bit, boolean isStereo, int desiredFrames) {
>+        int channelConfig = isStereo ? AudioFormat.CHANNEL_CONFIGURATION_STEREO : AudioFormat.CHANNEL_CONFIGURATION_MONO;
>+        int audioFormat = is16Bit ? AudioFormat.ENCODING_PCM_16BIT : AudioFormat.ENCODING_PCM_8BIT;
>+        int frameSize = (isStereo ? 2 : 1) * (is16Bit ? 2 : 1);
>+        
>+        Log.v("SDL", "SDL audio: wanted " + (isStereo ? "stereo" : "mono") + " " + (is16Bit ? "16-bit" : "8-bit") + " " + (sampleRate / 1000f) + "kHz, " + desiredFrames + " frames buffer");
>+        
>+        // Let the user pick a larger buffer if they really want -- but ye
>+        // gods they probably shouldn't, the minimums are horrifyingly high
>+        // latency already
>+        desiredFrames = Math.max(desiredFrames, (AudioTrack.getMinBufferSize(sampleRate, channelConfig, audioFormat) + frameSize - 1) / frameSize);
>+        
>+        if (mAudioTrack == null) {
>+            mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate,
>+                    channelConfig, audioFormat, desiredFrames * frameSize, AudioTrack.MODE_STREAM);
>+            
>+            // Instantiating AudioTrack can "succeed" without an exception and the track may still be invalid
>+            // Ref: https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/media/java/android/media/AudioTrack.java
>+            // Ref: http://developer.android.com/reference/android/media/AudioTrack.html#getState()
>+            
>+            if (mAudioTrack.getState() != AudioTrack.STATE_INITIALIZED) {
>+                Log.e("SDL", "Failed during initialization of Audio Track");
>+                mAudioTrack = null;
>+                return -1;
>+            }
>+            
>+            mAudioTrack.play();
>+        }
>+       
>+        Log.v("SDL", "SDL audio: got " + ((mAudioTrack.getChannelCount() >= 2) ? "stereo" : "mono") + " " + ((mAudioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit") + " " + (mAudioTrack.getSampleRate() / 1000f) + "kHz, " + desiredFrames + " frames buffer");
>+        
>+        return 0;
>+    }
>+    
>+    public static void audioWriteShortBuffer(short[] buffer) {
>+        for (int i = 0; i < buffer.length; ) {
>+            int result = mAudioTrack.write(buffer, i, buffer.length - i);
>+            if (result > 0) {
>+                i += result;
>+            } else if (result == 0) {
>+                try {
>+                    Thread.sleep(1);
>+                } catch(InterruptedException e) {
>+                    // Nom nom
>+                }
>+            } else {
>+                Log.w("SDL", "SDL audio: error return from write(short)");
>+                return;
>+            }
>+        }
>+    }
>+    
>+    public static void audioWriteByteBuffer(byte[] buffer) {
>+        for (int i = 0; i < buffer.length; ) {
>+            int result = mAudioTrack.write(buffer, i, buffer.length - i);
>+            if (result > 0) {
>+                i += result;
>+            } else if (result == 0) {
>+                try {
>+                    Thread.sleep(1);
>+                } catch(InterruptedException e) {
>+                    // Nom nom
>+                }
>+            } else {
>+                Log.w("SDL", "SDL audio: error return from write(byte)");
>+                return;
>+            }
>+        }
>+    }
>+
>+    public static void audioQuit() {
>+        if (mAudioTrack != null) {
>+            mAudioTrack.stop();
>+            mAudioTrack = null;
>+        }
>+    }
>+
>+    // Input
>+
>+    /**
>+     * @return an array which may be empty but is never null.
>+     */
>+    public static int[] inputGetInputDeviceIds(int sources) {
>+        int[] ids = InputDevice.getDeviceIds();
>+        int[] filtered = new int[ids.length];
>+        int used = 0;
>+        for (int i = 0; i < ids.length; ++i) {
>+            InputDevice device = InputDevice.getDevice(ids[i]);
>+            if ((device != null) && ((device.getSources() & sources) != 0)) {
>+                filtered[used++] = device.getId();
>+            }
>+        }
>+        return Arrays.copyOf(filtered, used);
>+    }
>+            
>+    // Joystick glue code, just a series of stubs that redirect to the SDLJoystickHandler instance
>+    public static boolean handleJoystickMotionEvent(MotionEvent event) {
>+        return mJoystickHandler.handleMotionEvent(event);
>+    }
>+    
>+    public static void pollInputDevices() {
>+        if (SDLActivity.mSDLThread != null) {
>+            mJoystickHandler.pollInputDevices();
>+        }
>+    }
>+    
>+}
>+
>+/**
>+    Simple nativeInit() runnable
>+*/
>+class SDLMain implements Runnable {
>+    @Override
>+    public void run() {
>+        // Runs SDL_main()
>+        SDLActivity.nativeInit();
>+
>+        //Log.v("SDL", "SDL thread terminated");
>+    }
>+}
>+
>+
>+/**
>+    SDLSurface. This is what we draw on, so we need to know when it's created
>+    in order to do anything useful. 
>+
>+    Because of this, that's where we set up the SDL thread
>+*/
>+class SDLSurface extends SurfaceView implements SurfaceHolder.Callback, 
>+    View.OnKeyListener, View.OnTouchListener, SensorEventListener  {
>+
>+    // Sensors
>+    protected static SensorManager mSensorManager;
>+    protected static Display mDisplay;
>+
>+    // Keep track of the surface size to normalize touch events
>+    protected static float mWidth, mHeight;
>+
>+    // Startup    
>+    public SDLSurface(Context context) {
>+        super(context);
>+        getHolder().addCallback(this); 
>+    
>+        setFocusable(true);
>+        setFocusableInTouchMode(true);
>+        requestFocus();
>+        setOnKeyListener(this); 
>+        setOnTouchListener(this);   
>+
>+        mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
>+        mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
>+        
>+        if(Build.VERSION.SDK_INT >= 12) {
>+            setOnGenericMotionListener(new SDLGenericMotionListener_API12());
>+        }
>+
>+        // Some arbitrary defaults to avoid a potential division by zero
>+        mWidth = 1.0f;
>+        mHeight = 1.0f;
>+    }
>+    
>+    public Surface getNativeSurface() {
>+        return getHolder().getSurface();
>+    }
>+
>+    // Called when we have a valid drawing surface
>+    @Override
>+    public void surfaceCreated(SurfaceHolder holder) {
>+        Log.v("SDL", "surfaceCreated()");
>+        holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
>+    }
>+
>+    // Called when we lose the surface
>+    @Override
>+    public void surfaceDestroyed(SurfaceHolder holder) {
>+        Log.v("SDL", "surfaceDestroyed()");
>+        // Call this *before* setting mIsSurfaceReady to 'false'
>+        SDLActivity.handlePause();
>+        SDLActivity.mIsSurfaceReady = false;
>+        SDLActivity.onNativeSurfaceDestroyed();
>+    }
>+
>+    // Called when the surface is resized
>+    @Override
>+    public void surfaceChanged(SurfaceHolder holder,
>+                               int format, int width, int height) {
>+        Log.v("SDL", "surfaceChanged()");
>+
>+        int sdlFormat = 0x15151002; // SDL_PIXELFORMAT_RGB565 by default
>+        switch (format) {
>+        case PixelFormat.A_8:
>+            Log.v("SDL", "pixel format A_8");
>+            break;
>+        case PixelFormat.LA_88:
>+            Log.v("SDL", "pixel format LA_88");
>+            break;
>+        case PixelFormat.L_8:
>+            Log.v("SDL", "pixel format L_8");
>+            break;
>+        case PixelFormat.RGBA_4444:
>+            Log.v("SDL", "pixel format RGBA_4444");
>+            sdlFormat = 0x15421002; // SDL_PIXELFORMAT_RGBA4444
>+            break;
>+        case PixelFormat.RGBA_5551:
>+            Log.v("SDL", "pixel format RGBA_5551");
>+            sdlFormat = 0x15441002; // SDL_PIXELFORMAT_RGBA5551
>+            break;
>+        case PixelFormat.RGBA_8888:
>+            Log.v("SDL", "pixel format RGBA_8888");
>+            sdlFormat = 0x16462004; // SDL_PIXELFORMAT_RGBA8888
>+            break;
>+        case PixelFormat.RGBX_8888:
>+            Log.v("SDL", "pixel format RGBX_8888");
>+            sdlFormat = 0x16261804; // SDL_PIXELFORMAT_RGBX8888
>+            break;
>+        case PixelFormat.RGB_332:
>+            Log.v("SDL", "pixel format RGB_332");
>+            sdlFormat = 0x14110801; // SDL_PIXELFORMAT_RGB332
>+            break;
>+        case PixelFormat.RGB_565:
>+            Log.v("SDL", "pixel format RGB_565");
>+            sdlFormat = 0x15151002; // SDL_PIXELFORMAT_RGB565
>+            break;
>+        case PixelFormat.RGB_888:
>+            Log.v("SDL", "pixel format RGB_888");
>+            // Not sure this is right, maybe SDL_PIXELFORMAT_RGB24 instead?
>+            sdlFormat = 0x16161804; // SDL_PIXELFORMAT_RGB888
>+            break;
>+        default:
>+            Log.v("SDL", "pixel format unknown " + format);
>+            break;
>+        }
>+
>+        mWidth = width;
>+        mHeight = height;
>+        SDLActivity.onNativeResize(width, height, sdlFormat);
>+        Log.v("SDL", "Window size:" + width + "x"+height);
>+
>+        // Set mIsSurfaceReady to 'true' *before* making a call to handleResume
>+        SDLActivity.mIsSurfaceReady = true;
>+        SDLActivity.onNativeSurfaceChanged();
>+
>+
>+        if (SDLActivity.mSDLThread == null) {
>+            // This is the entry point to the C app.
>+            // Start up the C app thread and enable sensor input for the first time
>+
>+            SDLActivity.mSDLThread = new Thread(new SDLMain(), "SDLThread");
>+            enableSensor(Sensor.TYPE_ACCELEROMETER, true);
>+            SDLActivity.mSDLThread.start();
>+            
>+            // Set up a listener thread to catch when the native thread ends
>+            new Thread(new Runnable(){
>+                @Override
>+                public void run(){
>+                    try {
>+                        SDLActivity.mSDLThread.join();
>+                    }
>+                    catch(Exception e){}
>+                    finally{ 
>+                        // Native thread has finished
>+                        if (! SDLActivity.mExitCalledFromJava) {
>+                            SDLActivity.handleNativeExit();
>+                        }
>+                    }
>+                }
>+            }).start();
>+        }
>+    }
>+
>+    // unused
>+    @Override
>+    public void onDraw(Canvas canvas) {}
>+
>+
>+    // Key events
>+    @Override
>+    public boolean onKey(View  v, int keyCode, KeyEvent event) {
>+        // Dispatch the different events depending on where they come from
>+        // Some SOURCE_DPAD or SOURCE_GAMEPAD are also SOURCE_KEYBOARD
>+        // So, we try to process them as DPAD or GAMEPAD events first, if that fails we try them as KEYBOARD
>+        
>+        if ( (event.getSource() & 0x00000401) != 0 || /* API 12: SOURCE_GAMEPAD */
>+                   (event.getSource() & InputDevice.SOURCE_DPAD) != 0 ) {
>+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+                if (SDLActivity.onNativePadDown(event.getDeviceId(), keyCode) == 0) {
>+                    return true;
>+                }
>+            } else if (event.getAction() == KeyEvent.ACTION_UP) {
>+                if (SDLActivity.onNativePadUp(event.getDeviceId(), keyCode) == 0) {
>+                    return true;
>+                }
>+            }
>+        }
>+        
>+        if( (event.getSource() & InputDevice.SOURCE_KEYBOARD) != 0) {
>+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+                //Log.v("SDL", "key down: " + keyCode);
>+                SDLActivity.onNativeKeyDown(keyCode);
>+                return true;
>+            }
>+            else if (event.getAction() == KeyEvent.ACTION_UP) {
>+                //Log.v("SDL", "key up: " + keyCode);
>+                SDLActivity.onNativeKeyUp(keyCode);
>+                return true;
>+            }
>+        }
>+        
>+        return false;
>+    }
>+
>+    // Touch events
>+    @Override
>+    public boolean onTouch(View v, MotionEvent event) {
>+        /* Ref: http://developer.android.com/training/gestures/multi.html */
>+        final int touchDevId = event.getDeviceId();
>+        final int pointerCount = event.getPointerCount();
>+        int action = event.getActionMasked();
>+        int pointerFingerId;
>+        int i = -1;
>+        float x,y,p;
>+        
>+        switch(action) {
>+            case MotionEvent.ACTION_MOVE:
>+                for (i = 0; i < pointerCount; i++) {
>+                    pointerFingerId = event.getPointerId(i);
>+                    x = event.getX(i) / mWidth;
>+                    y = event.getY(i) / mHeight;
>+                    p = event.getPressure(i);
>+                    SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
>+                }
>+                break;
>+            
>+            case MotionEvent.ACTION_UP:
>+            case MotionEvent.ACTION_DOWN:
>+                // Primary pointer up/down, the index is always zero
>+                i = 0;
>+            case MotionEvent.ACTION_POINTER_UP:
>+            case MotionEvent.ACTION_POINTER_DOWN:
>+                // Non primary pointer up/down
>+                if (i == -1) {
>+                    i = event.getActionIndex();
>+                }
>+                
>+                pointerFingerId = event.getPointerId(i);
>+                x = event.getX(i) / mWidth;
>+                y = event.getY(i) / mHeight;
>+                p = event.getPressure(i);
>+                SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
>+                break;
>+            
>+            default:
>+                break;
>+        }
>+
>+        return true;
>+   } 
>+
>+    // Sensor events
>+    public void enableSensor(int sensortype, boolean enabled) {
>+        // TODO: This uses getDefaultSensor - what if we have >1 accels?
>+        if (enabled) {
>+            mSensorManager.registerListener(this, 
>+                            mSensorManager.getDefaultSensor(sensortype), 
>+                            SensorManager.SENSOR_DELAY_GAME, null);
>+        } else {
>+            mSensorManager.unregisterListener(this, 
>+                            mSensorManager.getDefaultSensor(sensortype));
>+        }
>+    }
>+    
>+    @Override
>+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
>+        // TODO
>+    }
>+
>+    @Override
>+    public void onSensorChanged(SensorEvent event) {
>+        if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
>+            float x, y;
>+            switch (mDisplay.getRotation()) {
>+                case Surface.ROTATION_90:
>+                    x = -event.values[1];
>+                    y = event.values[0];
>+                    break;
>+                case Surface.ROTATION_270:
>+                    x = event.values[1];
>+                    y = -event.values[0];
>+                    break;
>+                case Surface.ROTATION_180:
>+                    x = -event.values[1];
>+                    y = -event.values[0];
>+                    break;
>+                default:
>+                    x = event.values[0];
>+                    y = event.values[1];
>+                    break;
>+            }
>+            SDLActivity.onNativeAccel(-x / SensorManager.GRAVITY_EARTH,
>+                                      y / SensorManager.GRAVITY_EARTH,
>+                                      event.values[2] / SensorManager.GRAVITY_EARTH - 1);
>+        }
>+    }    
>+}
>+
>+/* This is a fake invisible editor view that receives the input and defines the
>+ * pan&scan region
>+ */
>+class DummyEdit extends View implements View.OnKeyListener {
>+    InputConnection ic;
>+
>+    public DummyEdit(Context context) {
>+        super(context);
>+        setFocusableInTouchMode(true);
>+        setFocusable(true);
>+        setOnKeyListener(this);
>+    }
>+
>+    @Override
>+    public boolean onCheckIsTextEditor() {
>+        return true;
>+    }
>+
>+    @Override
>+    public boolean onKey(View v, int keyCode, KeyEvent event) {
>+
>+        // This handles the hardware keyboard input
>+        if (event.isPrintingKey()) {
>+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+                ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1);
>+            }
>+            return true;
>+        }
>+
>+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+            SDLActivity.onNativeKeyDown(keyCode);
>+            return true;
>+        } else if (event.getAction() == KeyEvent.ACTION_UP) {
>+            SDLActivity.onNativeKeyUp(keyCode);
>+            return true;
>+        }
>+
>+        return false;
>+    }
>+        
>+    //
>+    @Override
>+    public boolean onKeyPreIme (int keyCode, KeyEvent event) {
>+        // As seen on StackOverflow: http://stackoverflow.com/questions/7634346/keyboard-hide-event
>+        // FIXME: Discussion at http://bugzilla.libsdl.org/show_bug.cgi?id=1639
>+        // FIXME: This is not a 100% effective solution to the problem of detecting if the keyboard is showing or not
>+        // FIXME: A more effective solution would be to change our Layout from AbsoluteLayout to Relative or Linear
>+        // FIXME: And determine the keyboard presence doing this: http://stackoverflow.com/questions/2150078/how-to-check-visibility-of-software-keyboard-in-android
>+        // FIXME: An even more effective way would be if Android provided this out of the box, but where would the fun be in that :)
>+        if (event.getAction()==KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
>+            if (SDLActivity.mTextEdit != null && SDLActivity.mTextEdit.getVisibility() == View.VISIBLE) {
>+                SDLActivity.onNativeKeyboardFocusLost();
>+            }
>+        }
>+        return super.onKeyPreIme(keyCode, event);
>+    }
>+
>+    @Override
>+    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
>+        ic = new SDLInputConnection(this, true);
>+
>+        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
>+                | 33554432 /* API 11: EditorInfo.IME_FLAG_NO_FULLSCREEN */;
>+
>+        return ic;
>+    }
>+}
>+
>+class SDLInputConnection extends BaseInputConnection {
>+
>+    public SDLInputConnection(View targetView, boolean fullEditor) {
>+        super(targetView, fullEditor);
>+
>+    }
>+
>+    @Override
>+    public boolean sendKeyEvent(KeyEvent event) {
>+
>+        /*
>+         * This handles the keycodes from soft keyboard (and IME-translated
>+         * input from hardkeyboard)
>+         */
>+        int keyCode = event.getKeyCode();
>+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+            if (event.isPrintingKey()) {
>+                commitText(String.valueOf((char) event.getUnicodeChar()), 1);
>+            }
>+            SDLActivity.onNativeKeyDown(keyCode);
>+            return true;
>+        } else if (event.getAction() == KeyEvent.ACTION_UP) {
>+
>+            SDLActivity.onNativeKeyUp(keyCode);
>+            return true;
>+        }
>+        return super.sendKeyEvent(event);
>+    }
>+
>+    @Override
>+    public boolean commitText(CharSequence text, int newCursorPosition) {
>+
>+        nativeCommitText(text.toString(), newCursorPosition);
>+
>+        return super.commitText(text, newCursorPosition);
>+    }
>+
>+    @Override
>+    public boolean setComposingText(CharSequence text, int newCursorPosition) {
>+
>+        nativeSetComposingText(text.toString(), newCursorPosition);
>+
>+        return super.setComposingText(text, newCursorPosition);
>+    }
>+
>+    public native void nativeCommitText(String text, int newCursorPosition);
>+
>+    public native void nativeSetComposingText(String text, int newCursorPosition);
>+
>+    @Override
>+    public boolean deleteSurroundingText(int beforeLength, int afterLength) {       
>+        // Workaround to capture backspace key. Ref: http://stackoverflow.com/questions/14560344/android-backspace-in-webview-baseinputconnection
>+        if (beforeLength == 1 && afterLength == 0) {
>+            // backspace
>+            return super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL))
>+                && super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL));
>+        }
>+
>+        return super.deleteSurroundingText(beforeLength, afterLength);
>+    }
>+}
>+
>+/* A null joystick handler for API level < 12 devices (the accelerometer is handled separately) */
>+class SDLJoystickHandler {
>+    
>+    public boolean handleMotionEvent(MotionEvent event) {
>+        return false;
>+    }
>+    
>+    public void pollInputDevices() {
>+    }
>+}
>+
>+/* Actual joystick functionality available for API >= 12 devices */
>+class SDLJoystickHandler_API12 extends SDLJoystickHandler {
>+  
>+    class SDLJoystick {
>+        public int device_id;
>+        public String name;
>+        public ArrayList<InputDevice.MotionRange> axes;
>+    }
>+    
>+    private ArrayList<SDLJoystick> mJoysticks;
>+    
>+    public SDLJoystickHandler_API12() {
>+       
>+        mJoysticks = new ArrayList<SDLJoystick>();
>+    }
>+
>+    @Override
>+    public void pollInputDevices() {
>+        int[] deviceIds = InputDevice.getDeviceIds();
>+        // It helps processing the device ids in reverse order
>+        // For example, in the case of the XBox 360 wireless dongle,
>+        // so the first controller seen by SDL matches what the receiver
>+        // considers to be the first controller
>+        
>+        for(int i=deviceIds.length-1; i>-1; i--) {
>+            SDLJoystick joystick = getJoystick(deviceIds[i]);
>+            if (joystick == null) {
>+                joystick = new SDLJoystick();
>+                InputDevice joystickDevice = InputDevice.getDevice(deviceIds[i]);
>+                if( (joystickDevice.getSources() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
>+                    joystick.device_id = deviceIds[i];
>+                    joystick.name = joystickDevice.getName();
>+                    joystick.axes = new ArrayList<InputDevice.MotionRange>();
>+                    
>+                    for (InputDevice.MotionRange range : joystickDevice.getMotionRanges()) {
>+                         if ( (range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
>+                            joystick.axes.add(range);
>+                         }
>+                    }
>+                    
>+                    mJoysticks.add(joystick);
>+                    SDLActivity.nativeAddJoystick(joystick.device_id, joystick.name, 0, -1, joystick.axes.size(), 0, 0);
>+                }
>+            }
>+        }
>+        
>+        /* Check removed devices */
>+        ArrayList<Integer> removedDevices = new ArrayList<Integer>();
>+        for(int i=0; i < mJoysticks.size(); i++) {
>+            int device_id = mJoysticks.get(i).device_id;
>+            int j;
>+            for (j=0; j < deviceIds.length; j++) {
>+                if (device_id == deviceIds[j]) break;
>+            }
>+            if (j == deviceIds.length) {
>+                removedDevices.add(device_id);
>+            }
>+        }
>+            
>+        for(int i=0; i < removedDevices.size(); i++) {
>+            int device_id = removedDevices.get(i);
>+            SDLActivity.nativeRemoveJoystick(device_id);
>+            for (int j=0; j < mJoysticks.size(); j++) {
>+                if (mJoysticks.get(j).device_id == device_id) {
>+                    mJoysticks.remove(j);
>+                    break;
>+                }
>+            }
>+        }        
>+    }
>+    
>+    protected SDLJoystick getJoystick(int device_id) {
>+        for(int i=0; i < mJoysticks.size(); i++) {
>+            if (mJoysticks.get(i).device_id == device_id) {
>+                return mJoysticks.get(i);
>+            }
>+        }
>+        return null;
>+    }   
>+    
>+    @Override        
>+    public boolean handleMotionEvent(MotionEvent event) {
>+        if ( (event.getSource() & InputDevice.SOURCE_JOYSTICK) != 0) {
>+            int actionPointerIndex = event.getActionIndex();
>+            int action = event.getActionMasked();
>+            switch(action) {
>+                case MotionEvent.ACTION_MOVE:
>+                    SDLJoystick joystick = getJoystick(event.getDeviceId());
>+                    if ( joystick != null ) {
>+                        for (int i = 0; i < joystick.axes.size(); i++) {
>+                            InputDevice.MotionRange range = joystick.axes.get(i);
>+                            /* Normalize the value to -1...1 */
>+                            float value = ( event.getAxisValue( range.getAxis(), actionPointerIndex) - range.getMin() ) / range.getRange() * 2.0f - 1.0f;
>+                            SDLActivity.onNativeJoy(joystick.device_id, i, value );
>+                        }                       
>+                    }
>+                    break;
>+                default:
>+                    break;
>+            }
>+        }
>+        return true;
>+    }            
>+}
>+
>+class SDLGenericMotionListener_API12 implements View.OnGenericMotionListener {
>+    // Generic Motion (mouse hover, joystick...) events go here
>+    // We only have joysticks yet
>+    @Override
>+    public boolean onGenericMotion(View v, MotionEvent event) {
>+        return SDLActivity.handleJoystickMotionEvent(event);
>+    }
>+}
>diff -r 1b62b081a83b android/testjoystick/.classpath
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testjoystick/.classpath	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,9 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<classpath>
>+	<classpathentry kind="src" path="src"/>
>+	<classpathentry kind="src" path="gen"/>
>+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
>+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
>+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
>+	<classpathentry kind="output" path="bin/classes"/>
>+</classpath>
>diff -r 1b62b081a83b android/testjoystick/.project
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testjoystick/.project	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,33 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<projectDescription>
>+	<name>Test Joystick</name>
>+	<comment></comment>
>+	<projects>
>+	</projects>
>+	<buildSpec>
>+		<buildCommand>
>+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>org.eclipse.jdt.core.javabuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+		<buildCommand>
>+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
>+			<arguments>
>+			</arguments>
>+		</buildCommand>
>+	</buildSpec>
>+	<natures>
>+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
>+		<nature>org.eclipse.jdt.core.javanature</nature>
>+	</natures>
>+</projectDescription>
>diff -r 1b62b081a83b android/testjoystick/.settings/org.eclipse.ltk.core.refactoring.prefs
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testjoystick/.settings/org.eclipse.ltk.core.refactoring.prefs	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,2 @@
>+eclipse.preferences.version=1
>+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
>diff -r 1b62b081a83b android/testjoystick/AndroidManifest.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testjoystick/AndroidManifest.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,42 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+
>+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
>+      package="org.libsdl.testjoystick"
>+      android:versionCode="1"
>+      android:versionName="1.0"
>+      android:installLocation="auto">
>+
>+    
>+    <application android:label="@string/app_name"
>+                 android:icon="@drawable/ic_launcher"
>+                 android:allowBackup="true"
>+                 android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
>+        <activity android:name="SDLActivity"
>+                  android:label="@string/app_name">
>+            <intent-filter>
>+                <action android:name="android.intent.action.MAIN" />
>+                <category android:name="android.intent.category.LAUNCHER" />
>+            </intent-filter>
>+        </activity>
>+            
>+    </application>
>+
>+    
>+    <uses-sdk android:minSdkVersion="12" android:targetSdkVersion="16" />
>+
>+    
>+    <uses-feature android:glEsVersion="0x00020000" /> 
>+
>+    
>+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 
>+</manifest> 
>diff -r 1b62b081a83b android/testjoystick/ant.properties
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testjoystick/ant.properties	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,17 @@
>+# This file is used to override default values used by the Ant build system.
>+#
>+# This file must be checked into Version Control Systems, as it is
>+# integral to the build system of your project.
>+
>+# This file is only used by the Ant script.
>+
>+# You can use this to override default values such as
>+#  'source.dir' for the location of your java source folder and
>+#  'out.dir' for the location of your output folder.
>+
>+# You can also use it define how the release builds are signed by declaring
>+# the following properties:
>+#  'key.store' for the location of your keystore and
>+#  'key.alias' for the name of the key to use.
>+# The password will be asked during the build when you use the 'release' target.
>+
>diff -r 1b62b081a83b android/testjoystick/build.properties
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testjoystick/build.properties	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,17 @@
>+# This file is used to override default values used by the Ant build system.
>+# 
>+# This file must be checked in Version Control Systems, as it is
>+# integral to the build system of your project.
>+
>+# This file is only used by the Ant script.
>+
>+# You can use this to override default values such as
>+#  'source.dir' for the location of your java source folder and
>+#  'out.dir' for the location of your output folder.
>+
>+# You can also use it define how the release builds are signed by declaring
>+# the following properties:
>+#  'key.store' for the location of your keystore and
>+#  'key.alias' for the name of the key to use.
>+# The password will be asked during the build when you use the 'release' target.
>+
>diff -r 1b62b081a83b android/testjoystick/build.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testjoystick/build.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,93 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+
>+<project name="Joy Test" default="help">
>+
>+    
>+    <property file="local.properties" />
>+
>+    
>+    <property file="ant.properties" />
>+
>+    
>+    <property environment="env" />
>+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
>+        <isset property="env.ANDROID_HOME" />
>+    </condition>
>+
>+    
>+    <loadproperties srcFile="project.properties" />
>+
>+    
>+    <fail
>+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
>+            unless="sdk.dir"
>+    />
>+
>+    
>+    <import file="custom_rules.xml" optional="true" />
>+
>+    
>+    
>+    <import file="${sdk.dir}/tools/ant/build.xml" />
>+
>+</project>
>diff -r 1b62b081a83b android/testjoystick/clean.sh
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testjoystick/clean.sh	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,4 @@
>+rm -rf bin
>+rm -rf gen
>+rm -rf obj
>+rm -rf libs
>diff -r 1b62b081a83b android/testjoystick/default.properties
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testjoystick/default.properties	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,11 @@
>+# This file is automatically generated by Android Tools.
>+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
>+# 
>+# This file must be checked in Version Control Systems.
>+# 
>+# To customize properties used by the Ant build system use,
>+# "build.properties", and override values to adapt the script to your
>+# project structure.
>+
>+# Project target.
>+target=android-7
>diff -r 1b62b081a83b android/testjoystick/jni/Android.mk
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testjoystick/jni/Android.mk	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,1 @@
>+include $(call all-subdir-makefiles)
>diff -r 1b62b081a83b android/testjoystick/jni/Application.mk
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testjoystick/jni/Application.mk	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,6 @@
>+APP_ABI := armeabi x86
>+APP_PLATFORM := android-9
>+
>+# Uncomment this if you're using STL in your project
>+# See CPLUSPLUS-SUPPORT.html in the NDK documentation for more information
>+# APP_STL := stlport_static 
>diff -r 1b62b081a83b android/testjoystick/jni/SDL/Android.mk
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testjoystick/jni/SDL/Android.mk	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,52 @@
>+LOCAL_PATH := $(SDL2_HOME)
>+
>+###########################
>+#
>+# SDL shared library
>+#
>+###########################
>+
>+include $(CLEAR_VARS)
>+
>+LOCAL_MODULE := SDL2
>+
>+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
>+
>+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
>+
>+LOCAL_SRC_FILES := \
>+	$(subst $(LOCAL_PATH)/,, \
>+	$(wildcard $(LOCAL_PATH)/src/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/audio/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/audio/android/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/audio/dummy/*.c) \
>+	$(LOCAL_PATH)/src/atomic/SDL_atomic.c \
>+	$(LOCAL_PATH)/src/atomic/SDL_spinlock.c.arm \
>+	$(wildcard $(LOCAL_PATH)/src/core/android/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/cpuinfo/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/dynapi/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/events/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/file/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/haptic/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/haptic/dummy/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/joystick/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/joystick/android/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/power/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/power/android/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/filesystem/dummy/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/render/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/render/*/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/thread/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/thread/pthread/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/timer/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/timer/unix/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/video/*.c) \
>+	$(wildcard $(LOCAL_PATH)/src/video/android/*.c))
>+
>+LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DSDL_PREFIX=org_libsdl_testjoystick
>+LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
>+
>+
>+include $(BUILD_SHARED_LIBRARY)
>diff -r 1b62b081a83b android/testjoystick/jni/src/Android.mk
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testjoystick/jni/src/Android.mk	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,21 @@
>+LOCAL_PATH := $(call my-dir)
>+
>+include $(CLEAR_VARS)
>+
>+LOCAL_MODULE := main
>+
>+SDL2_PATH := ../../../..
>+
>+LOCAL_C_INCLUDES := $(SDL2_PATH)/include
>+
>+# Add your application source files here...
>+LOCAL_SRC_FILES := $(SDL2_PATH)/src/main/android/SDL_android_main.c \
>+	$(SDL2_PATH)/test/testjoystick.c
>+
>+LOCAL_CFLAGS += -DSDL_PREFIX=org_libsdl_testjoystick
>+
>+LOCAL_SHARED_LIBRARIES := SDL2
>+
>+LOCAL_LDLIBS := -lGLESv1_CM -llog
>+
>+include $(BUILD_SHARED_LIBRARY)
>diff -r 1b62b081a83b android/testjoystick/lint.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testjoystick/lint.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,3 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<lint>
>+</lint>
>\ No newline at end of file
>diff -r 1b62b081a83b android/testjoystick/proguard-project.txt
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testjoystick/proguard-project.txt	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,20 @@
>+# To enable ProGuard in your project, edit project.properties
>+# to define the proguard.config property as described in that file.
>+#
>+# Add project specific ProGuard rules here.
>+# By default, the flags in this file are appended to flags specified
>+# in ${sdk.dir}/tools/proguard/proguard-android.txt
>+# You can edit the include path and order by changing the ProGuard
>+# include property in project.properties.
>+#
>+# For more details, see
>+#   http://developer.android.com/guide/developing/tools/proguard.html
>+
>+# Add any project specific keep options here:
>+
>+# If your project uses WebView with JS, uncomment the following
>+# and specify the fully qualified class name to the JavaScript interface
>+# class:
>+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
>+#   public *;
>+#}
>diff -r 1b62b081a83b android/testjoystick/project.properties
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testjoystick/project.properties	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,14 @@
>+# This file is automatically generated by Android Tools.
>+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
>+#
>+# This file must be checked in Version Control Systems.
>+#
>+# To customize properties used by the Ant build system edit
>+# "ant.properties", and override values to adapt the script to your
>+# project structure.
>+#
>+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
>+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
>+
>+# Project target.
>+target=android-18
>diff -r 1b62b081a83b android/testjoystick/res/drawable-hdpi/ic_launcher.png
>Binary file android/testjoystick/res/drawable-hdpi/ic_launcher.png has changed
>diff -r 1b62b081a83b android/testjoystick/res/drawable-mdpi/ic_launcher.png
>Binary file android/testjoystick/res/drawable-mdpi/ic_launcher.png has changed
>diff -r 1b62b081a83b android/testjoystick/res/drawable-xhdpi/ic_launcher.png
>Binary file android/testjoystick/res/drawable-xhdpi/ic_launcher.png has changed
>diff -r 1b62b081a83b android/testjoystick/res/drawable-xxhdpi/ic_launcher.png
>Binary file android/testjoystick/res/drawable-xxhdpi/ic_launcher.png has changed
>diff -r 1b62b081a83b android/testjoystick/res/layout/main.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testjoystick/res/layout/main.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,13 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
>+    android:orientation="vertical"
>+    android:layout_width="fill_parent"
>+    android:layout_height="fill_parent"
>+    >
>+<TextView  
>+    android:layout_width="fill_parent" 
>+    android:layout_height="wrap_content" 
>+    android:text="Hello World, SDLActivity"
>+    />
>+</LinearLayout>
>+
>diff -r 1b62b081a83b android/testjoystick/res/values/strings.xml
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testjoystick/res/values/strings.xml	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,4 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+<resources>
>+    <string name="app_name">Test Joystick</string>
>+</resources>
>diff -r 1b62b081a83b android/testjoystick/src/org/libsdl/testjoystick/SDLActivity.java
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/android/testjoystick/src/org/libsdl/testjoystick/SDLActivity.java	Tue Feb 11 19:49:36 2014 -0800
>@@ -0,0 +1,1029 @@
>+package org.libsdl.testjoystick;
>+
>+import java.util.ArrayList;
>+import java.util.Arrays;
>+
>+import android.app.*;
>+import android.content.*;
>+import android.view.*;
>+import android.view.inputmethod.BaseInputConnection;
>+import android.view.inputmethod.EditorInfo;
>+import android.view.inputmethod.InputConnection;
>+import android.view.inputmethod.InputMethodManager;
>+import android.widget.AbsoluteLayout;
>+import android.os.*;
>+import android.util.Log;
>+import android.graphics.*;
>+import android.media.*;
>+import android.hardware.*;
>+
>+
>+/**
>+    SDL Activity
>+*/
>+public class SDLActivity extends Activity {
>+    private static final String TAG = "SDL";
>+
>+    // Keep track of the paused state
>+    public static boolean mIsPaused = false, mIsSurfaceReady = false, mHasFocus = true;
>+    public static boolean mExitCalledFromJava;
>+
>+    // Main components
>+    protected static SDLActivity mSingleton;
>+    protected static SDLSurface mSurface;
>+    protected static View mTextEdit;
>+    protected static ViewGroup mLayout;
>+    protected static SDLJoystickHandler mJoystickHandler;
>+
>+    // This is what SDL runs in. It invokes SDL_main(), eventually
>+    protected static Thread mSDLThread;
>+    
>+    // Audio
>+    protected static Thread mAudioThread;
>+    protected static AudioTrack mAudioTrack;
>+
>+    // Load the .so
>+    static {
>+        System.loadLibrary("SDL2");
>+        //System.loadLibrary("SDL2_image");
>+        //System.loadLibrary("SDL2_mixer");
>+        //System.loadLibrary("SDL2_net");
>+        //System.loadLibrary("SDL2_ttf");
>+        System.loadLibrary("main");
>+    }
>+
>+    // Setup
>+    @Override
>+    protected void onCreate(Bundle savedInstanceState) {
>+        //Log.v("SDL", "onCreate()");
>+        super.onCreate(savedInstanceState);
>+        
>+        // So we can call stuff from static callbacks
>+        mSingleton = this;
>+
>+        // Set up the surface
>+        mSurface = new SDLSurface(getApplication());
>+        
>+        // Make sure this variable is initialized here!
>+        mExitCalledFromJava = false;
>+        
>+        if(Build.VERSION.SDK_INT >= 12) {
>+            mJoystickHandler = new SDLJoystickHandler_API12();
>+        }
>+        else {
>+            mJoystickHandler = new SDLJoystickHandler();
>+        }
>+
>+        mLayout = new AbsoluteLayout(this);
>+        mLayout.addView(mSurface);
>+
>+        setContentView(mLayout);
>+    }
>+
>+    // Events
>+    @Override
>+    protected void onPause() {
>+        Log.v("SDL", "onPause()");
>+        super.onPause();
>+        SDLActivity.handlePause();
>+    }
>+
>+    @Override
>+    protected void onResume() {
>+        Log.v("SDL", "onResume()");
>+        super.onResume();
>+        SDLActivity.handleResume();
>+    }
>+
>+
>+    @Override
>+    public void onWindowFocusChanged(boolean hasFocus) {
>+        super.onWindowFocusChanged(hasFocus);
>+        Log.v("SDL", "onWindowFocusChanged(): " + hasFocus);
>+
>+        SDLActivity.mHasFocus = hasFocus;
>+        if (hasFocus) {
>+            SDLActivity.handleResume();
>+        }
>+    }
>+
>+    @Override
>+    public void onLowMemory() {
>+        Log.v("SDL", "onLowMemory()");
>+        super.onLowMemory();
>+        SDLActivity.nativeLowMemory();
>+    }
>+
>+    @Override
>+    protected void onDestroy() {
>+        super.onDestroy();
>+        Log.v("SDL", "onDestroy()");
>+        // Send a quit message to the application
>+        SDLActivity.mExitCalledFromJava = true;
>+        SDLActivity.nativeQuit();
>+
>+        // Now wait for the SDL thread to quit
>+        if (SDLActivity.mSDLThread != null) {
>+            try {
>+                SDLActivity.mSDLThread.join();
>+            } catch(Exception e) {
>+                Log.v("SDL", "Problem stopping thread: " + e);
>+            }
>+            SDLActivity.mSDLThread = null;
>+
>+            //Log.v("SDL", "Finished waiting for SDL thread");
>+        }
>+    }
>+
>+    @Override
>+    public boolean dispatchKeyEvent(KeyEvent event) {
>+        int keyCode = event.getKeyCode();
>+        // Ignore certain special keys so they're handled by Android
>+        if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
>+            keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
>+            keyCode == KeyEvent.KEYCODE_CAMERA ||
>+            keyCode == 168 || /* API 11: KeyEvent.KEYCODE_ZOOM_IN */
>+            keyCode == 169 /* API 11: KeyEvent.KEYCODE_ZOOM_OUT */
>+            ) {
>+            return false;
>+        }
>+        return super.dispatchKeyEvent(event);
>+    }
>+
>+    /** Called by onPause or surfaceDestroyed. Even if surfaceDestroyed
>+     *  is the first to be called, mIsSurfaceReady should still be set
>+     *  to 'true' during the call to onPause (in a usual scenario).
>+     */
>+    public static void handlePause() {
>+        if (!SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady) {
>+            SDLActivity.mIsPaused = true;
>+            SDLActivity.nativePause();
>+            mSurface.enableSensor(Sensor.TYPE_ACCELEROMETER, false);
>+        }
>+    }
>+
>+    /** Called by onResume or surfaceCreated. An actual resume should be done only when the surface is ready.
>+     * Note: Some Android variants may send multiple surfaceChanged events, so we don't need to resume
>+     * every time we get one of those events, only if it comes after surfaceDestroyed
>+     */
>+    public static void handleResume() {
>+        if (SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady && SDLActivity.mHasFocus) {
>+            SDLActivity.mIsPaused = false;
>+            SDLActivity.nativeResume();
>+            mSurface.enableSensor(Sensor.TYPE_ACCELEROMETER, true);
>+        }
>+    }
>+        
>+    /* The native thread has finished */
>+    public static void handleNativeExit() {
>+        SDLActivity.mSDLThread = null;
>+        mSingleton.finish();
>+    }
>+
>+
>+    // Messages from the SDLMain thread
>+    static final int COMMAND_CHANGE_TITLE = 1;
>+    static final int COMMAND_UNUSED = 2;
>+    static final int COMMAND_TEXTEDIT_HIDE = 3;
>+
>+    protected static final int COMMAND_USER = 0x8000;
>+
>+    /**
>+     * This method is called by SDL if SDL did not handle a message itself.
>+     * This happens if a received message contains an unsupported command.
>+     * Method can be overwritten to handle Messages in a different class.
>+     * @param command the command of the message.
>+     * @param param the parameter of the message. May be null.
>+     * @return if the message was handled in overridden method.
>+     */
>+    protected boolean onUnhandledMessage(int command, Object param) {
>+        return false;
>+    }
>+
>+    /**
>+     * A Handler class for Messages from native SDL applications.
>+     * It uses current Activities as target (e.g. for the title).
>+     * static to prevent implicit references to enclosing object.
>+     */
>+    protected static class SDLCommandHandler extends Handler {
>+        @Override
>+        public void handleMessage(Message msg) {
>+            Context context = getContext();
>+            if (context == null) {
>+                Log.e(TAG, "error handling message, getContext() returned null");
>+                return;
>+            }
>+            switch (msg.arg1) {
>+            case COMMAND_CHANGE_TITLE:
>+                if (context instanceof Activity) {
>+                    ((Activity) context).setTitle((String)msg.obj);
>+                } else {
>+                    Log.e(TAG, "error handling message, getContext() returned no Activity");
>+                }
>+                break;
>+            case COMMAND_TEXTEDIT_HIDE:
>+                if (mTextEdit != null) {
>+                    mTextEdit.setVisibility(View.GONE);
>+
>+                    InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
>+                    imm.hideSoftInputFromWindow(mTextEdit.getWindowToken(), 0);
>+                }
>+                break;
>+
>+            default:
>+                if ((context instanceof SDLActivity) && !((SDLActivity) context).onUnhandledMessage(msg.arg1, msg.obj)) {
>+                    Log.e(TAG, "error handling message, command is " + msg.arg1);
>+                }
>+            }
>+        }
>+    }
>+
>+    // Handler for the messages
>+    Handler commandHandler = new SDLCommandHandler();
>+
>+    // Send a message from the SDLMain thread
>+    boolean sendCommand(int command, Object data) {
>+        Message msg = commandHandler.obtainMessage();
>+        msg.arg1 = command;
>+        msg.obj = data;
>+        return commandHandler.sendMessage(msg);
>+    }
>+
>+    // C functions we call
>+    public static native void nativeInit();
>+    public static native void nativeLowMemory();
>+    public static native void nativeQuit();
>+    public static native void nativePause();
>+    public static native void nativeResume();
>+    public static native void onNativeResize(int x, int y, int format);
>+    public static native int onNativePadDown(int device_id, int keycode);
>+    public static native int onNativePadUp(int device_id, int keycode);
>+    public static native void onNativeJoy(int device_id, int axis,
>+                                          float value);
>+    public static native void onNativeKeyDown(int keycode);
>+    public static native void onNativeKeyUp(int keycode);
>+    public static native void onNativeKeyboardFocusLost();
>+    public static native void onNativeTouch(int touchDevId, int pointerFingerId,
>+                                            int action, float x, 
>+                                            float y, float p);
>+    public static native void onNativeAccel(float x, float y, float z);
>+    public static native void onNativeSurfaceChanged();
>+    public static native void onNativeSurfaceDestroyed();
>+    public static native void nativeFlipBuffers();
>+    public static native int nativeAddJoystick(int device_id, String name, 
>+                                               int is_accelerometer, int nbuttons, 
>+                                               int naxes, int nhats, int nballs);
>+    public static native int nativeRemoveJoystick(int device_id);
>+
>+    public static void flipBuffers() {
>+        SDLActivity.nativeFlipBuffers();
>+    }
>+
>+    public static boolean setActivityTitle(String title) {
>+        // Called from SDLMain() thread and can't directly affect the view
>+        return mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title);
>+    }
>+
>+    public static boolean sendMessage(int command, int param) {
>+        return mSingleton.sendCommand(command, Integer.valueOf(param));
>+    }
>+
>+    public static Context getContext() {
>+        return mSingleton;
>+    }
>+
>+    /**
>+     * @return result of getSystemService(name) but executed on UI thread.
>+     */
>+    public Object getSystemServiceFromUiThread(final String name) {
>+        final Object lock = new Object();
>+        final Object[] results = new Object[2]; // array for writable variables
>+        synchronized (lock) {
>+            runOnUiThread(new Runnable() {
>+                @Override
>+                public void run() {
>+                    synchronized (lock) {
>+                        results[0] = getSystemService(name);
>+                        results[1] = Boolean.TRUE;
>+                        lock.notify();
>+                    }
>+                }
>+            });
>+            if (results[1] == null) {
>+                try {
>+                    lock.wait();
>+                } catch (InterruptedException ex) {
>+                    ex.printStackTrace();
>+                }
>+            }
>+        }
>+        return results[0];
>+    }
>+
>+    static class ShowTextInputTask implements Runnable {
>+        /*
>+         * This is used to regulate the pan&scan method to have some offset from
>+         * the bottom edge of the input region and the top edge of an input
>+         * method (soft keyboard)
>+         */
>+        static final int HEIGHT_PADDING = 15;
>+
>+        public int x, y, w, h;
>+
>+        public ShowTextInputTask(int x, int y, int w, int h) {
>+            this.x = x;
>+            this.y = y;
>+            this.w = w;
>+            this.h = h;
>+        }
>+
>+        @Override
>+        public void run() {
>+            AbsoluteLayout.LayoutParams params = new AbsoluteLayout.LayoutParams(
>+                    w, h + HEIGHT_PADDING, x, y);
>+
>+            if (mTextEdit == null) {
>+                mTextEdit = new DummyEdit(getContext());
>+
>+                mLayout.addView(mTextEdit, params);
>+            } else {
>+                mTextEdit.setLayoutParams(params);
>+            }
>+
>+            mTextEdit.setVisibility(View.VISIBLE);
>+            mTextEdit.requestFocus();
>+
>+            InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
>+            imm.showSoftInput(mTextEdit, 0);
>+        }
>+    }
>+
>+    public static boolean showTextInput(int x, int y, int w, int h) {
>+        // Transfer the task to the main thread as a Runnable
>+        return mSingleton.commandHandler.post(new ShowTextInputTask(x, y, w, h));
>+    }
>+            
>+    public static Surface getNativeSurface() {
>+        return SDLActivity.mSurface.getNativeSurface();
>+    }
>+
>+    // Audio
>+    public static int audioInit(int sampleRate, boolean is16Bit, boolean isStereo, int desiredFrames) {
>+        int channelConfig = isStereo ? AudioFormat.CHANNEL_CONFIGURATION_STEREO : AudioFormat.CHANNEL_CONFIGURATION_MONO;
>+        int audioFormat = is16Bit ? AudioFormat.ENCODING_PCM_16BIT : AudioFormat.ENCODING_PCM_8BIT;
>+        int frameSize = (isStereo ? 2 : 1) * (is16Bit ? 2 : 1);
>+        
>+        Log.v("SDL", "SDL audio: wanted " + (isStereo ? "stereo" : "mono") + " " + (is16Bit ? "16-bit" : "8-bit") + " " + (sampleRate / 1000f) + "kHz, " + desiredFrames + " frames buffer");
>+        
>+        // Let the user pick a larger buffer if they really want -- but ye
>+        // gods they probably shouldn't, the minimums are horrifyingly high
>+        // latency already
>+        desiredFrames = Math.max(desiredFrames, (AudioTrack.getMinBufferSize(sampleRate, channelConfig, audioFormat) + frameSize - 1) / frameSize);
>+        
>+        if (mAudioTrack == null) {
>+            mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate,
>+                    channelConfig, audioFormat, desiredFrames * frameSize, AudioTrack.MODE_STREAM);
>+            
>+            // Instantiating AudioTrack can "succeed" without an exception and the track may still be invalid
>+            // Ref: https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/media/java/android/media/AudioTrack.java
>+            // Ref: http://developer.android.com/reference/android/media/AudioTrack.html#getState()
>+            
>+            if (mAudioTrack.getState() != AudioTrack.STATE_INITIALIZED) {
>+                Log.e("SDL", "Failed during initialization of Audio Track");
>+                mAudioTrack = null;
>+                return -1;
>+            }
>+            
>+            mAudioTrack.play();
>+        }
>+       
>+        Log.v("SDL", "SDL audio: got " + ((mAudioTrack.getChannelCount() >= 2) ? "stereo" : "mono") + " " + ((mAudioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit") + " " + (mAudioTrack.getSampleRate() / 1000f) + "kHz, " + desiredFrames + " frames buffer");
>+        
>+        return 0;
>+    }
>+    
>+    public static void audioWriteShortBuffer(short[] buffer) {
>+        for (int i = 0; i < buffer.length; ) {
>+            int result = mAudioTrack.write(buffer, i, buffer.length - i);
>+            if (result > 0) {
>+                i += result;
>+            } else if (result == 0) {
>+                try {
>+                    Thread.sleep(1);
>+                } catch(InterruptedException e) {
>+                    // Nom nom
>+                }
>+            } else {
>+                Log.w("SDL", "SDL audio: error return from write(short)");
>+                return;
>+            }
>+        }
>+    }
>+    
>+    public static void audioWriteByteBuffer(byte[] buffer) {
>+        for (int i = 0; i < buffer.length; ) {
>+            int result = mAudioTrack.write(buffer, i, buffer.length - i);
>+            if (result > 0) {
>+                i += result;
>+            } else if (result == 0) {
>+                try {
>+                    Thread.sleep(1);
>+                } catch(InterruptedException e) {
>+                    // Nom nom
>+                }
>+            } else {
>+                Log.w("SDL", "SDL audio: error return from write(byte)");
>+                return;
>+            }
>+        }
>+    }
>+
>+    public static void audioQuit() {
>+        if (mAudioTrack != null) {
>+            mAudioTrack.stop();
>+            mAudioTrack = null;
>+        }
>+    }
>+
>+    // Input
>+
>+    /**
>+     * @return an array which may be empty but is never null.
>+     */
>+    public static int[] inputGetInputDeviceIds(int sources) {
>+        int[] ids = InputDevice.getDeviceIds();
>+        int[] filtered = new int[ids.length];
>+        int used = 0;
>+        for (int i = 0; i < ids.length; ++i) {
>+            InputDevice device = InputDevice.getDevice(ids[i]);
>+            if ((device != null) && ((device.getSources() & sources) != 0)) {
>+                filtered[used++] = device.getId();
>+            }
>+        }
>+        return Arrays.copyOf(filtered, used);
>+    }
>+            
>+    // Joystick glue code, just a series of stubs that redirect to the SDLJoystickHandler instance
>+    public static boolean handleJoystickMotionEvent(MotionEvent event) {
>+        return mJoystickHandler.handleMotionEvent(event);
>+    }
>+    
>+    public static void pollInputDevices() {
>+        if (SDLActivity.mSDLThread != null) {
>+            mJoystickHandler.pollInputDevices();
>+        }
>+    }
>+    
>+}
>+
>+/**
>+    Simple nativeInit() runnable
>+*/
>+class SDLMain implements Runnable {
>+    @Override
>+    public void run() {
>+        // Runs SDL_main()
>+        SDLActivity.nativeInit();
>+
>+        //Log.v("SDL", "SDL thread terminated");
>+    }
>+}
>+
>+
>+/**
>+    SDLSurface. This is what we draw on, so we need to know when it's created
>+    in order to do anything useful. 
>+
>+    Because of this, that's where we set up the SDL thread
>+*/
>+class SDLSurface extends SurfaceView implements SurfaceHolder.Callback, 
>+    View.OnKeyListener, View.OnTouchListener, SensorEventListener  {
>+
>+    // Sensors
>+    protected static SensorManager mSensorManager;
>+    protected static Display mDisplay;
>+
>+    // Keep track of the surface size to normalize touch events
>+    protected static float mWidth, mHeight;
>+
>+    // Startup    
>+    public SDLSurface(Context context) {
>+        super(context);
>+        getHolder().addCallback(this); 
>+    
>+        setFocusable(true);
>+        setFocusableInTouchMode(true);
>+        requestFocus();
>+        setOnKeyListener(this); 
>+        setOnTouchListener(this);   
>+
>+        mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
>+        mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
>+        
>+        if(Build.VERSION.SDK_INT >= 12) {
>+            setOnGenericMotionListener(new SDLGenericMotionListener_API12());
>+        }
>+
>+        // Some arbitrary defaults to avoid a potential division by zero
>+        mWidth = 1.0f;
>+        mHeight = 1.0f;
>+    }
>+    
>+    public Surface getNativeSurface() {
>+        return getHolder().getSurface();
>+    }
>+
>+    // Called when we have a valid drawing surface
>+    @Override
>+    public void surfaceCreated(SurfaceHolder holder) {
>+        Log.v("SDL", "surfaceCreated()");
>+        holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
>+    }
>+
>+    // Called when we lose the surface
>+    @Override
>+    public void surfaceDestroyed(SurfaceHolder holder) {
>+        Log.v("SDL", "surfaceDestroyed()");
>+        // Call this *before* setting mIsSurfaceReady to 'false'
>+        SDLActivity.handlePause();
>+        SDLActivity.mIsSurfaceReady = false;
>+        SDLActivity.onNativeSurfaceDestroyed();
>+    }
>+
>+    // Called when the surface is resized
>+    @Override
>+    public void surfaceChanged(SurfaceHolder holder,
>+                               int format, int width, int height) {
>+        Log.v("SDL", "surfaceChanged()");
>+
>+        int sdlFormat = 0x15151002; // SDL_PIXELFORMAT_RGB565 by default
>+        switch (format) {
>+        case PixelFormat.A_8:
>+            Log.v("SDL", "pixel format A_8");
>+            break;
>+        case PixelFormat.LA_88:
>+            Log.v("SDL", "pixel format LA_88");
>+            break;
>+        case PixelFormat.L_8:
>+            Log.v("SDL", "pixel format L_8");
>+            break;
>+        case PixelFormat.RGBA_4444:
>+            Log.v("SDL", "pixel format RGBA_4444");
>+            sdlFormat = 0x15421002; // SDL_PIXELFORMAT_RGBA4444
>+            break;
>+        case PixelFormat.RGBA_5551:
>+            Log.v("SDL", "pixel format RGBA_5551");
>+            sdlFormat = 0x15441002; // SDL_PIXELFORMAT_RGBA5551
>+            break;
>+        case PixelFormat.RGBA_8888:
>+            Log.v("SDL", "pixel format RGBA_8888");
>+            sdlFormat = 0x16462004; // SDL_PIXELFORMAT_RGBA8888
>+            break;
>+        case PixelFormat.RGBX_8888:
>+            Log.v("SDL", "pixel format RGBX_8888");
>+            sdlFormat = 0x16261804; // SDL_PIXELFORMAT_RGBX8888
>+            break;
>+        case PixelFormat.RGB_332:
>+            Log.v("SDL", "pixel format RGB_332");
>+            sdlFormat = 0x14110801; // SDL_PIXELFORMAT_RGB332
>+            break;
>+        case PixelFormat.RGB_565:
>+            Log.v("SDL", "pixel format RGB_565");
>+            sdlFormat = 0x15151002; // SDL_PIXELFORMAT_RGB565
>+            break;
>+        case PixelFormat.RGB_888:
>+            Log.v("SDL", "pixel format RGB_888");
>+            // Not sure this is right, maybe SDL_PIXELFORMAT_RGB24 instead?
>+            sdlFormat = 0x16161804; // SDL_PIXELFORMAT_RGB888
>+            break;
>+        default:
>+            Log.v("SDL", "pixel format unknown " + format);
>+            break;
>+        }
>+
>+        mWidth = width;
>+        mHeight = height;
>+        SDLActivity.onNativeResize(width, height, sdlFormat);
>+        Log.v("SDL", "Window size:" + width + "x"+height);
>+
>+        // Set mIsSurfaceReady to 'true' *before* making a call to handleResume
>+        SDLActivity.mIsSurfaceReady = true;
>+        SDLActivity.onNativeSurfaceChanged();
>+
>+
>+        if (SDLActivity.mSDLThread == null) {
>+            // This is the entry point to the C app.
>+            // Start up the C app thread and enable sensor input for the first time
>+
>+            SDLActivity.mSDLThread = new Thread(new SDLMain(), "SDLThread");
>+            enableSensor(Sensor.TYPE_ACCELEROMETER, true);
>+            SDLActivity.mSDLThread.start();
>+            
>+            // Set up a listener thread to catch when the native thread ends
>+            new Thread(new Runnable(){
>+                @Override
>+                public void run(){
>+                    try {
>+                        SDLActivity.mSDLThread.join();
>+                    }
>+                    catch(Exception e){}
>+                    finally{ 
>+                        // Native thread has finished
>+                        if (! SDLActivity.mExitCalledFromJava) {
>+                            SDLActivity.handleNativeExit();
>+                        }
>+                    }
>+                }
>+            }).start();
>+        }
>+    }
>+
>+    // unused
>+    @Override
>+    public void onDraw(Canvas canvas) {}
>+
>+
>+    // Key events
>+    @Override
>+    public boolean onKey(View  v, int keyCode, KeyEvent event) {
>+        // Dispatch the different events depending on where they come from
>+        // Some SOURCE_DPAD or SOURCE_GAMEPAD are also SOURCE_KEYBOARD
>+        // So, we try to process them as DPAD or GAMEPAD events first, if that fails we try them as KEYBOARD
>+        
>+        if ( (event.getSource() & 0x00000401) != 0 || /* API 12: SOURCE_GAMEPAD */
>+                   (event.getSource() & InputDevice.SOURCE_DPAD) != 0 ) {
>+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+                if (SDLActivity.onNativePadDown(event.getDeviceId(), keyCode) == 0) {
>+                    return true;
>+                }
>+            } else if (event.getAction() == KeyEvent.ACTION_UP) {
>+                if (SDLActivity.onNativePadUp(event.getDeviceId(), keyCode) == 0) {
>+                    return true;
>+                }
>+            }
>+        }
>+        
>+        if( (event.getSource() & InputDevice.SOURCE_KEYBOARD) != 0) {
>+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+                //Log.v("SDL", "key down: " + keyCode);
>+                SDLActivity.onNativeKeyDown(keyCode);
>+                return true;
>+            }
>+            else if (event.getAction() == KeyEvent.ACTION_UP) {
>+                //Log.v("SDL", "key up: " + keyCode);
>+                SDLActivity.onNativeKeyUp(keyCode);
>+                return true;
>+            }
>+        }
>+        
>+        return false;
>+    }
>+
>+    // Touch events
>+    @Override
>+    public boolean onTouch(View v, MotionEvent event) {
>+        /* Ref: http://developer.android.com/training/gestures/multi.html */
>+        final int touchDevId = event.getDeviceId();
>+        final int pointerCount = event.getPointerCount();
>+        int action = event.getActionMasked();
>+        int pointerFingerId;
>+        int i = -1;
>+        float x,y,p;
>+        
>+        switch(action) {
>+            case MotionEvent.ACTION_MOVE:
>+                for (i = 0; i < pointerCount; i++) {
>+                    pointerFingerId = event.getPointerId(i);
>+                    x = event.getX(i) / mWidth;
>+                    y = event.getY(i) / mHeight;
>+                    p = event.getPressure(i);
>+                    SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
>+                }
>+                break;
>+            
>+            case MotionEvent.ACTION_UP:
>+            case MotionEvent.ACTION_DOWN:
>+                // Primary pointer up/down, the index is always zero
>+                i = 0;
>+            case MotionEvent.ACTION_POINTER_UP:
>+            case MotionEvent.ACTION_POINTER_DOWN:
>+                // Non primary pointer up/down
>+                if (i == -1) {
>+                    i = event.getActionIndex();
>+                }
>+                
>+                pointerFingerId = event.getPointerId(i);
>+                x = event.getX(i) / mWidth;
>+                y = event.getY(i) / mHeight;
>+                p = event.getPressure(i);
>+                SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
>+                break;
>+            
>+            default:
>+                break;
>+        }
>+
>+        return true;
>+   } 
>+
>+    // Sensor events
>+    public void enableSensor(int sensortype, boolean enabled) {
>+        // TODO: This uses getDefaultSensor - what if we have >1 accels?
>+        if (enabled) {
>+            mSensorManager.registerListener(this, 
>+                            mSensorManager.getDefaultSensor(sensortype), 
>+                            SensorManager.SENSOR_DELAY_GAME, null);
>+        } else {
>+            mSensorManager.unregisterListener(this, 
>+                            mSensorManager.getDefaultSensor(sensortype));
>+        }
>+    }
>+    
>+    @Override
>+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
>+        // TODO
>+    }
>+
>+    @Override
>+    public void onSensorChanged(SensorEvent event) {
>+        if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
>+            float x, y;
>+            switch (mDisplay.getRotation()) {
>+                case Surface.ROTATION_90:
>+                    x = -event.values[1];
>+                    y = event.values[0];
>+                    break;
>+                case Surface.ROTATION_270:
>+                    x = event.values[1];
>+                    y = -event.values[0];
>+                    break;
>+                case Surface.ROTATION_180:
>+                    x = -event.values[1];
>+                    y = -event.values[0];
>+                    break;
>+                default:
>+                    x = event.values[0];
>+                    y = event.values[1];
>+                    break;
>+            }
>+            SDLActivity.onNativeAccel(-x / SensorManager.GRAVITY_EARTH,
>+                                      y / SensorManager.GRAVITY_EARTH,
>+                                      event.values[2] / SensorManager.GRAVITY_EARTH - 1);
>+        }
>+    }    
>+}
>+
>+/* This is a fake invisible editor view that receives the input and defines the
>+ * pan&scan region
>+ */
>+class DummyEdit extends View implements View.OnKeyListener {
>+    InputConnection ic;
>+
>+    public DummyEdit(Context context) {
>+        super(context);
>+        setFocusableInTouchMode(true);
>+        setFocusable(true);
>+        setOnKeyListener(this);
>+    }
>+
>+    @Override
>+    public boolean onCheckIsTextEditor() {
>+        return true;
>+    }
>+
>+    @Override
>+    public boolean onKey(View v, int keyCode, KeyEvent event) {
>+
>+        // This handles the hardware keyboard input
>+        if (event.isPrintingKey()) {
>+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+                ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1);
>+            }
>+            return true;
>+        }
>+
>+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+            SDLActivity.onNativeKeyDown(keyCode);
>+            return true;
>+        } else if (event.getAction() == KeyEvent.ACTION_UP) {
>+            SDLActivity.onNativeKeyUp(keyCode);
>+            return true;
>+        }
>+
>+        return false;
>+    }
>+        
>+    //
>+    @Override
>+    public boolean onKeyPreIme (int keyCode, KeyEvent event) {
>+        // As seen on StackOverflow: http://stackoverflow.com/questions/7634346/keyboard-hide-event
>+        // FIXME: Discussion at http://bugzilla.libsdl.org/show_bug.cgi?id=1639
>+        // FIXME: This is not a 100% effective solution to the problem of detecting if the keyboard is showing or not
>+        // FIXME: A more effective solution would be to change our Layout from AbsoluteLayout to Relative or Linear
>+        // FIXME: And determine the keyboard presence doing this: http://stackoverflow.com/questions/2150078/how-to-check-visibility-of-software-keyboard-in-android
>+        // FIXME: An even more effective way would be if Android provided this out of the box, but where would the fun be in that :)
>+        if (event.getAction()==KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
>+            if (SDLActivity.mTextEdit != null && SDLActivity.mTextEdit.getVisibility() == View.VISIBLE) {
>+                SDLActivity.onNativeKeyboardFocusLost();
>+            }
>+        }
>+        return super.onKeyPreIme(keyCode, event);
>+    }
>+
>+    @Override
>+    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
>+        ic = new SDLInputConnection(this, true);
>+
>+        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
>+                | 33554432 /* API 11: EditorInfo.IME_FLAG_NO_FULLSCREEN */;
>+
>+        return ic;
>+    }
>+}
>+
>+class SDLInputConnection extends BaseInputConnection {
>+
>+    public SDLInputConnection(View targetView, boolean fullEditor) {
>+        super(targetView, fullEditor);
>+
>+    }
>+
>+    @Override
>+    public boolean sendKeyEvent(KeyEvent event) {
>+
>+        /*
>+         * This handles the keycodes from soft keyboard (and IME-translated
>+         * input from hardkeyboard)
>+         */
>+        int keyCode = event.getKeyCode();
>+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
>+            if (event.isPrintingKey()) {
>+                commitText(String.valueOf((char) event.getUnicodeChar()), 1);
>+            }
>+            SDLActivity.onNativeKeyDown(keyCode);
>+            return true;
>+        } else if (event.getAction() == KeyEvent.ACTION_UP) {
>+
>+            SDLActivity.onNativeKeyUp(keyCode);
>+            return true;
>+        }
>+        return super.sendKeyEvent(event);
>+    }
>+
>+    @Override
>+    public boolean commitText(CharSequence text, int newCursorPosition) {
>+
>+        nativeCommitText(text.toString(), newCursorPosition);
>+
>+        return super.commitText(text, newCursorPosition);
>+    }
>+
>+    @Override
>+    public boolean setComposingText(CharSequence text, int newCursorPosition) {
>+
>+        nativeSetComposingText(text.toString(), newCursorPosition);
>+
>+        return super.setComposingText(text, newCursorPosition);
>+    }
>+
>+    public native void nativeCommitText(String text, int newCursorPosition);
>+
>+    public native void nativeSetComposingText(String text, int newCursorPosition);
>+
>+    @Override
>+    public boolean deleteSurroundingText(int beforeLength, int afterLength) {       
>+        // Workaround to capture backspace key. Ref: http://stackoverflow.com/questions/14560344/android-backspace-in-webview-baseinputconnection
>+        if (beforeLength == 1 && afterLength == 0) {
>+            // backspace
>+            return super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL))
>+                && super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL));
>+        }
>+
>+        return super.deleteSurroundingText(beforeLength, afterLength);
>+    }
>+}
>+
>+/* A null joystick handler for API level < 12 devices (the accelerometer is handled separately) */
>+class SDLJoystickHandler {
>+    
>+    public boolean handleMotionEvent(MotionEvent event) {
>+        return false;
>+    }
>+    
>+    public void pollInputDevices() {
>+    }
>+}
>+
>+/* Actual joystick functionality available for API >= 12 devices */
>+class SDLJoystickHandler_API12 extends SDLJoystickHandler {
>+  
>+    class SDLJoystick {
>+        public int device_id;
>+        public String name;
>+        public ArrayList<InputDevice.MotionRange> axes;
>+    }
>+    
>+    private ArrayList<SDLJoystick> mJoysticks;
>+    
>+    public SDLJoystickHandler_API12() {
>+       
>+        mJoysticks = new ArrayList<SDLJoystick>();
>+    }
>+
>+    @Override
>+    public void pollInputDevices() {
>+        int[] deviceIds = InputDevice.getDeviceIds();
>+        // It helps processing the device ids in reverse order
>+        // For example, in the case of the XBox 360 wireless dongle,
>+        // so the first controller seen by SDL matches what the receiver
>+        // considers to be the first controller
>+        
>+        for(int i=deviceIds.length-1; i>-1; i--) {
>+            SDLJoystick joystick = getJoystick(deviceIds[i]);
>+            if (joystick == null) {
>+                joystick = new SDLJoystick();
>+                InputDevice joystickDevice = InputDevice.getDevice(deviceIds[i]);
>+                if( (joystickDevice.getSources() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
>+                    joystick.device_id = deviceIds[i];
>+                    joystick.name = joystickDevice.getName();
>+                    joystick.axes = new ArrayList<InputDevice.MotionRange>();
>+                    
>+                    for (InputDevice.MotionRange range : joystickDevice.getMotionRanges()) {
>+                         if ( (range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
>+                            joystick.axes.add(range);
>+                         }
>+                    }
>+                    
>+                    mJoysticks.add(joystick);
>+                    SDLActivity.nativeAddJoystick(joystick.device_id, joystick.name, 0, -1, joystick.axes.size(), 0, 0);
>+                }
>+            }
>+        }
>+        
>+        /* Check removed devices */
>+        ArrayList<Integer> removedDevices = new ArrayList<Integer>();
>+        for(int i=0; i < mJoysticks.size(); i++) {
>+            int device_id = mJoysticks.get(i).device_id;
>+            int j;
>+            for (j=0; j < deviceIds.length; j++) {
>+                if (device_id == deviceIds[j]) break;
>+            }
>+            if (j == deviceIds.length) {
>+                removedDevices.add(device_id);
>+            }
>+        }
>+            
>+        for(int i=0; i < removedDevices.size(); i++) {
>+            int device_id = removedDevices.get(i);
>+            SDLActivity.nativeRemoveJoystick(device_id);
>+            for (int j=0; j < mJoysticks.size(); j++) {
>+                if (mJoysticks.get(j).device_id == device_id) {
>+                    mJoysticks.remove(j);
>+                    break;
>+                }
>+            }
>+        }        
>+    }
>+    
>+    protected SDLJoystick getJoystick(int device_id) {
>+        for(int i=0; i < mJoysticks.size(); i++) {
>+            if (mJoysticks.get(i).device_id == device_id) {
>+                return mJoysticks.get(i);
>+            }
>+        }
>+        return null;
>+    }   
>+    
>+    @Override        
>+    public boolean handleMotionEvent(MotionEvent event) {
>+        if ( (event.getSource() & InputDevice.SOURCE_JOYSTICK) != 0) {
>+            int actionPointerIndex = event.getActionIndex();
>+            int action = event.getActionMasked();
>+            switch(action) {
>+                case MotionEvent.ACTION_MOVE:
>+                    SDLJoystick joystick = getJoystick(event.getDeviceId());
>+                    if ( joystick != null ) {
>+                        for (int i = 0; i < joystick.axes.size(); i++) {
>+                            InputDevice.MotionRange range = joystick.axes.get(i);
>+                            /* Normalize the value to -1...1 */
>+                            float value = ( event.getAxisValue( range.getAxis(), actionPointerIndex) - range.getMin() ) / range.getRange() * 2.0f - 1.0f;
>+                            SDLActivity.onNativeJoy(joystick.device_id, i, value );
>+                        }                       
>+                    }
>+                    break;
>+                default:
>+                    break;
>+            }
>+        }
>+        return true;
>+    }            
>+}
>+
>+class SDLGenericMotionListener_API12 implements View.OnGenericMotionListener {
>+    // Generic Motion (mouse hover, joystick...) events go here
>+    // We only have joysticks yet
>+    @Override
>+    public boolean onGenericMotion(View v, MotionEvent event) {
>+        return SDLActivity.handleJoystickMotionEvent(event);
>+    }
>+}
>diff -r 1b62b081a83b src/core/android/SDL_android.c
>--- a/src/core/android/SDL_android.c	Wed Jan 22 12:39:34 2014 -0500
>+++ b/src/core/android/SDL_android.c	Tue Feb 11 19:49:36 2014 -0800
>@@ -49,6 +49,16 @@
> /* Uncomment this to log messages entering and exiting methods in this file */
> /* #define DEBUG_JNI */
> 
>+#ifndef SDL_PREFIX
>+    #pragma warning Defaulting to org.libsdl.app
>+	#define SDL_PREFIX		org_libsdl_app
>+#endif
>+
>+#define CONCAT1(p,f)	CONCAT2(p,f)
>+#define CONCAT2(p,f)	Java_ ## p ## _ ## f
>+
>+#define JNI(f)			CONCAT1(SDL_PREFIX,f)
>+
> static void Android_JNI_ThreadDestroyed(void*);
> 
> /*******************************************************************************
>@@ -141,7 +151,7 @@
> }
> 
> /* Resize */
>-void Java_org_libsdl_app_SDLActivity_onNativeResize(
>+void JNI(SDLActivity_onNativeResize)(
>                                     JNIEnv* env, jclass jcls,
>                                     jint width, jint height, jint format)
> {
>@@ -149,7 +159,7 @@
> }
> 
> // Paddown
>-int Java_org_libsdl_app_SDLActivity_onNativePadDown(
>+int JNI(SDLActivity_onNativePadDown)(
>                                     JNIEnv* env, jclass jcls,
>                                     jint device_id, jint keycode)
> {
>@@ -157,7 +167,7 @@
> }
> 
> // Padup
>-int Java_org_libsdl_app_SDLActivity_onNativePadUp(
>+int JNI(SDLActivity_onNativePadUp)(
>                                    JNIEnv* env, jclass jcls,
>                                    jint device_id, jint keycode)
> {
>@@ -165,7 +175,7 @@
> }
> 
> /* Joy */
>-void Java_org_libsdl_app_SDLActivity_onNativeJoy(
>+void JNI(SDLActivity_onNativeJoy)(
>                                     JNIEnv* env, jclass jcls,
>                                     jint device_id, jint axis, jfloat value)
> {
>@@ -173,7 +183,7 @@
> }
> 
> 
>-int Java_org_libsdl_app_SDLActivity_nativeAddJoystick(
>+int JNI(SDLActivity_nativeAddJoystick)(
>     JNIEnv* env, jclass jcls,
>     jint device_id, jstring device_name, jint is_accelerometer, 
>     jint nbuttons, jint naxes, jint nhats, jint nballs)
>@@ -188,7 +198,7 @@
>     return retval;
> }
> 
>-int Java_org_libsdl_app_SDLActivity_nativeRemoveJoystick(
>+int JNI(SDLActivity_nativeRemoveJoystick)(
>     JNIEnv* env, jclass jcls, jint device_id)
> {
>     return Android_RemoveJoystick(device_id);
>@@ -196,7 +206,7 @@
> 
> 
> /* Surface Created */
>-void Java_org_libsdl_app_SDLActivity_onNativeSurfaceChanged(JNIEnv* env, jclass jcls)
>+void JNI(SDLActivity_onNativeSurfaceChanged)(JNIEnv* env, jclass jcls)
> {
>     SDL_WindowData *data;
>     SDL_VideoDevice *_this;
>@@ -222,7 +232,7 @@
> }
> 
> /* Surface Destroyed */
>-void Java_org_libsdl_app_SDLActivity_onNativeSurfaceDestroyed(JNIEnv* env, jclass jcls)
>+void JNI(SDLActivity_onNativeSurfaceDestroyed)(JNIEnv* env, jclass jcls)
> {
>     /* We have to clear the current context and destroy the egl surface here
>      * Otherwise there's BAD_NATIVE_WINDOW errors coming from eglCreateWindowSurface on resume
>@@ -248,27 +258,27 @@
> 
> }
> 
>-void Java_org_libsdl_app_SDLActivity_nativeFlipBuffers(JNIEnv* env, jclass jcls)
>+void JNI(SDLActivity_nativeFlipBuffers)(JNIEnv* env, jclass jcls)
> {
>     SDL_GL_SwapWindow(Android_Window);
> }
> 
> /* Keydown */
>-void Java_org_libsdl_app_SDLActivity_onNativeKeyDown(
>+void JNI(SDLActivity_onNativeKeyDown)(
>                                     JNIEnv* env, jclass jcls, jint keycode)
> {
>     Android_OnKeyDown(keycode);
> }
> 
> /* Keyup */
>-void Java_org_libsdl_app_SDLActivity_onNativeKeyUp(
>+void JNI(SDLActivity_onNativeKeyUp)(
>                                     JNIEnv* env, jclass jcls, jint keycode)
> {
>     Android_OnKeyUp(keycode);
> }
> 
> /* Keyboard Focus Lost */
>-void Java_org_libsdl_app_SDLActivity_onNativeKeyboardFocusLost(
>+void JNI(SDLActivity_onNativeKeyboardFocusLost)(
>                                     JNIEnv* env, jclass jcls)
> {
>     /* Calling SDL_StopTextInput will take care of hiding the keyboard and cleaning up the DummyText widget */
>@@ -277,7 +287,7 @@
> 
> 
> /* Touch */
>-void Java_org_libsdl_app_SDLActivity_onNativeTouch(
>+void JNI(SDLActivity_onNativeTouch)(
>                                     JNIEnv* env, jclass jcls,
>                                     jint touch_device_id_in, jint pointer_finger_id_in,
>                                     jint action, jfloat x, jfloat y, jfloat p)
>@@ -286,7 +296,7 @@
> }
> 
> /* Accelerometer */
>-void Java_org_libsdl_app_SDLActivity_onNativeAccel(
>+void JNI(SDLActivity_onNativeAccel)(
>                                     JNIEnv* env, jclass jcls,
>                                     jfloat x, jfloat y, jfloat z)
> {
>@@ -297,14 +307,14 @@
> }
> 
> /* Low memory */
>-void Java_org_libsdl_app_SDLActivity_nativeLowMemory(
>+void JNI(SDLActivity_nativeLowMemory)(
>                                     JNIEnv* env, jclass cls)
> {
>     SDL_SendAppEvent(SDL_APP_LOWMEMORY);
> }
> 
> /* Quit */
>-void Java_org_libsdl_app_SDLActivity_nativeQuit(
>+void JNI(SDLActivity_nativeQuit)(
>                                     JNIEnv* env, jclass cls)
> {
>     /* Discard previous events. The user should have handled state storage
>@@ -320,7 +330,7 @@
> }
> 
> /* Pause */
>-void Java_org_libsdl_app_SDLActivity_nativePause(
>+void JNI(SDLActivity_nativePause)(
>                                     JNIEnv* env, jclass cls)
> {
>     __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "nativePause()");
>@@ -337,7 +347,7 @@
> }
> 
> /* Resume */
>-void Java_org_libsdl_app_SDLActivity_nativeResume(
>+void JNI(SDLActivity_nativeResume)(
>                                     JNIEnv* env, jclass cls)
> {
>     __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "nativeResume()");
>@@ -355,7 +365,7 @@
>     }
> }
> 
>-void Java_org_libsdl_app_SDLInputConnection_nativeCommitText(
>+void JNI(SDLInputConnection_nativeCommitText)(
>                                     JNIEnv* env, jclass cls,
>                                     jstring text, jint newCursorPosition)
> {
>@@ -366,7 +376,7 @@
>     (*env)->ReleaseStringUTFChars(env, text, utftext);
> }
> 
>-void Java_org_libsdl_app_SDLInputConnection_nativeSetComposingText(
>+void JNI(SDLInputConnection_nativeSetComposingText)(
>                                     JNIEnv* env, jclass cls,
>                                     jstring text, jint newCursorPosition)
> {
>diff -r 1b62b081a83b src/main/android/SDL_android_main.c
>--- a/src/main/android/SDL_android_main.c	Wed Jan 22 12:39:34 2014 -0500
>+++ b/src/main/android/SDL_android_main.c	Tue Feb 11 19:49:36 2014 -0800
>@@ -11,11 +11,22 @@
> *******************************************************************************/
> #include <jni.h>
> 
>+#ifndef SDL_PREFIX
>+    #pragma warning Defaulting to org.libsdl.app
>+	#define SDL_PREFIX		org_libdl_app
>+#endif
>+
>+#define CONCAT1(p,f)	CONCAT2(p,f)
>+#define CONCAT2(p,f)	Java_ ## p ## _ ## f
>+
>+#define JNI(f)			CONCAT1(SDL_PREFIX,f)
>+
>+
> /* Called before SDL_main() to initialize JNI bindings in SDL library */
> extern void SDL_Android_Init(JNIEnv* env, jclass cls);
> 
> /* Start up the SDL app */
>-void Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jclass cls, jobject obj)
>+void JNI(SDLActivity_nativeInit)(JNIEnv* env, jclass cls, jobject obj)
> {
>     /* This interface could expand with ABI negotiation, calbacks, etc. */
>     SDL_Android_Init(env, cls);

Actions: View | Diff

Attachments on bug 2393: 1556

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.