diff options
Diffstat (limited to 'backends/platform/android')
| -rw-r--r-- | backends/platform/android/android.mk | 11 | ||||
| -rw-r--r-- | backends/platform/android/events.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java | 14 |
3 files changed, 19 insertions, 8 deletions
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk index 7c4fe01d54..69aa9d8303 100644 --- a/backends/platform/android/android.mk +++ b/backends/platform/android/android.mk @@ -26,13 +26,10 @@ PATH_RESOURCES = $(PATH_DIST)/res PORT_DISTFILES = $(PATH_DIST)/README.Android -# FIXME: OUYA specific. -# "values-television" not present in vanilla Android. -# $(PATH_RESOURCES)/../res-ouya/values-television/margins.xml \ - RESOURCES = \ $(PATH_RESOURCES)/values/strings.xml \ $(PATH_RESOURCES)/values/margins.xml \ + $(PATH_RESOURCES)/values-television/margins.xml \ $(PATH_RESOURCES)/layout/main.xml \ $(PATH_RESOURCES)/layout/splash.xml \ $(PATH_RESOURCES)/drawable/gradient.xml \ @@ -48,10 +45,10 @@ PLUGIN_RESOURCES = \ #LDFLAGS += -Wl,--gc-sections #CXXFLAGS += -ffunction-sections -fdata-sections -fvisibility=hidden -fvisibility-inlines-hidden -AAPT = $(ANDROID_SDK)/platform-tools/aapt +AAPT = $(ANDROID_SDK)/$(ANDROID_BTOOLS)/aapt ADB = $(ANDROID_SDK)/platform-tools/adb -DX = $(ANDROID_SDK)/platform-tools/dx -APKBUILDER = $(ANDROID_SDK)/tools/apkbuilder +DX = $(ANDROID_SDK)/$(ANDROID_BTOOLS)/dx +APKBUILDER = java -Xmx128M -classpath $(ANDROID_SDK)/tools/lib/sdklib.jar com.android.sdklib.build.ApkBuilderMain JAVAC ?= javac JAVACFLAGS = -source 1.5 -target 1.5 diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp index c60626ec36..8039981a92 100644 --- a/backends/platform/android/events.cpp +++ b/backends/platform/android/events.cpp @@ -263,7 +263,7 @@ void OSystem_Android::setupKeymapper() { Action *act; act = new Action(globalMap, "VIRT", "Display keyboard"); - act->addKeyEvent(KeyState(KEYCODE_F7, ASCII_F7, 0)); + act->addKeyEvent(KeyState(KEYCODE_F7, ASCII_F7, KBD_CTRL)); mapper->addGlobalKeymap(globalMap); diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java index 5964d5bfde..f4eb7ddd0b 100644 --- a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java +++ b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java @@ -3,6 +3,7 @@ package org.scummvm.scummvm; import android.app.Activity; import android.app.AlertDialog; import android.content.DialogInterface; +import android.content.Intent; import android.media.AudioManager; import android.os.Build; import android.os.Bundle; @@ -201,6 +202,7 @@ public class ScummVMActivity extends Activity { if (_scummvm != null) _scummvm.setPause(false); + showMouseCursor(false); } @Override @@ -211,6 +213,7 @@ public class ScummVMActivity extends Activity { if (_scummvm != null) _scummvm.setPause(true); + showMouseCursor(true); } @Override @@ -267,4 +270,15 @@ public class ScummVMActivity extends Activity { imm.hideSoftInputFromWindow(main_surface.getWindowToken(), InputMethodManager.HIDE_IMPLICIT_ONLY); } + + private void showMouseCursor(boolean show) { + /* Currently hiding the system mouse cursor is only + supported on OUYA. If other systems provide similar + intents, please add them here as well */ + Intent intent = + new Intent(show? + "tv.ouya.controller.action.SHOW_CURSOR" : + "tv.ouya.controller.action.HIDE_CURSOR"); + sendBroadcast(intent); + } } |