From cf41ac0fec13c1191fd107bf25505713aa60afde Mon Sep 17 00:00:00 2001
From: dhewg
Date: Sun, 1 May 2011 18:07:27 +0200
Subject: ANDROID: Disable the savegame parachute

Only on the stable branch, since this is unfinished and might wipe
savegames of the user.
---
 backends/platform/android/jni.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'backends/platform/android')

diff --git a/backends/platform/android/jni.cpp b/backends/platform/android/jni.cpp
index f23d71b2a4..55c0ce6025 100644
--- a/backends/platform/android/jni.cpp
+++ b/backends/platform/android/jni.cpp
@@ -588,10 +588,12 @@ void JNI::setPause(JNIEnv *env, jobject self, jboolean value) {
 
 		g_engine->pauseEngine(value);
 
+#if 0
 		if (value &&
 				g_engine->hasFeature(Engine::kSupportsSavingDuringRuntime) &&
 				g_engine->canSaveGameStateCurrently())
 			g_engine->saveGameState(0, "Android parachute");
+#endif
 	}
 
 	pause = value;
-- 
cgit v1.2.3


From 16f0dcc00b96db001fad8c6a035576a72540d5dc Mon Sep 17 00:00:00 2001
From: dhewg
Date: Sat, 7 May 2011 20:08:29 +0200
Subject: ANDROID: Get rid of Fn->ALT metakey mapping

Thanks to Ge0rG for the analysis

Cherry-picked from bfecb37501b6fdc35f2802216db5fb2b0e54b8ee
---
 backends/platform/android/events.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'backends/platform/android')

diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp
index 09466b4d2f..90f92790da 100644
--- a/backends/platform/android/events.cpp
+++ b/backends/platform/android/events.cpp
@@ -444,8 +444,12 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
 
 		if (arg4 & JMETA_SHIFT)
 			e.kbd.flags |= Common::KBD_SHIFT;
-		if (arg4 & JMETA_ALT)
-			e.kbd.flags |= Common::KBD_ALT;
+		// JMETA_ALT is Fn on physical keyboards!
+		// when mapping this to ALT - as we know it from PC keyboards - all
+		// Fn combos will be broken (like Fn+q, which needs to end as 1 and
+		// not ALT+1). Do not want.
+		//if (arg4 & JMETA_ALT)
+		//	e.kbd.flags |= Common::KBD_ALT;
 		if (arg4 & (JMETA_SYM | JMETA_CTRL))
 			e.kbd.flags |= Common::KBD_CTRL;
 
-- 
cgit v1.2.3