[Scummvm-cvs-logs] scummvm master -> 3fb85835a10eb75c7a5b2f40504004abd94c73c3

dhewg dhewg at wiibrew.org
Sat Feb 26 11:21:00 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3fb85835a1 ANDROID: Allow softkeybd on all devices


Commit: 3fb85835a10eb75c7a5b2f40504004abd94c73c3
    https://github.com/scummvm/scummvm/commit/3fb85835a10eb75c7a5b2f40504004abd94c73c3
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-02-26T02:20:23-08:00

Commit Message:
ANDROID: Allow softkeybd on all devices

Changed paths:
    backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java



diff --git a/backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java b/backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java
index 09d39d2..8929809 100644
--- a/backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java
+++ b/backends/platform/android/org/inodes/gus/scummvm/ScummVMActivity.java
@@ -97,14 +97,11 @@ public class ScummVMActivity extends Activity {
 
 		@Override
 		protected void showVirtualKeyboard(final boolean enable) {
-			if (getResources().getConfiguration().keyboard ==
-				Configuration.KEYBOARD_NOKEYS) {
-				runOnUiThread(new Runnable() {
-						public void run() {
-							showKeyboard(enable);
-						}
-					});
-			}
+			runOnUiThread(new Runnable() {
+					public void run() {
+						showKeyboard(enable);
+					}
+				});
 		}
 	}
 	private MyScummVM scummvm;
@@ -271,18 +268,16 @@ public class ScummVMActivity extends Activity {
 			if (kevent.getRepeatCount() > 0)
 				// Ignore keyrepeat for menu
 				return false;
-			boolean timeout_fired = false;
-			if (getResources().getConfiguration().keyboard ==
-				Configuration.KEYBOARD_NOKEYS) {
-				timeout_fired = !keycodeMenuTimeoutHandler.hasMessages(MSG_MENU_LONG_PRESS);
-				keycodeMenuTimeoutHandler.removeMessages(MSG_MENU_LONG_PRESS);
-				if (kevent.getAction() == KeyEvent.ACTION_DOWN) {
-					keycodeMenuTimeoutHandler.sendMessageDelayed(
-																 keycodeMenuTimeoutHandler.obtainMessage(MSG_MENU_LONG_PRESS),
-																 ViewConfiguration.getLongPressTimeout());
-					return true;
-				}
+
+			boolean timeout_fired = !keycodeMenuTimeoutHandler.hasMessages(MSG_MENU_LONG_PRESS);
+			keycodeMenuTimeoutHandler.removeMessages(MSG_MENU_LONG_PRESS);
+
+			if (kevent.getAction() == KeyEvent.ACTION_DOWN) {
+				keycodeMenuTimeoutHandler.sendMessageDelayed(keycodeMenuTimeoutHandler.obtainMessage(MSG_MENU_LONG_PRESS),
+															 ViewConfiguration.getLongPressTimeout());
+				return true;
 			}
+
 			if (kevent.getAction() == KeyEvent.ACTION_UP) {
 				if (!timeout_fired)
 					scummvm.pushEvent(new Event(Event.EVENT_MAINMENU));






More information about the Scummvm-git-logs mailing list