diff options
| -rw-r--r-- | backends/platform/android/android.mk | 1 | ||||
| -rw-r--r-- | backends/platform/android/events.cpp | 21 | ||||
| -rw-r--r-- | backends/platform/android/org/scummvm/scummvm/ScummVMEvents.java | 2 | ||||
| -rw-r--r-- | dists/android/AndroidManifest.xml | 16 | ||||
| -rw-r--r-- | dists/android/AndroidManifest.xml.in | 16 | ||||
| -rw-r--r-- | dists/android/res/drawable-xhdpi/leanback_icon.png | bin | 0 -> 25962 bytes |
6 files changed, 55 insertions, 1 deletions
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk index e11ad0724e..68a2a34ae1 100644 --- a/backends/platform/android/android.mk +++ b/backends/platform/android/android.mk @@ -20,6 +20,7 @@ RESOURCES = \ $(PATH_BUILD_RES)/layout/main.xml \ $(PATH_BUILD_RES)/drawable/scummvm.png \ $(PATH_BUILD_RES)/drawable/scummvm_big.png \ + $(PATH_BUILD_RES)/drawable-xhdpi/leanback_icon.png \ $(PATH_BUILD_RES)/drawable-xhdpi/ouya_icon.png DIST_ANDROID_MK = $(PATH_DIST)/jni/Android.mk diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp index 8039981a92..b146945a01 100644 --- a/backends/platform/android/events.cpp +++ b/backends/platform/android/events.cpp @@ -101,7 +101,9 @@ enum { JKEYCODE_MEDIA_NEXT = 87, JKEYCODE_MEDIA_PREVIOUS = 88, JKEYCODE_MEDIA_REWIND = 89, - JKEYCODE_MEDIA_FAST_FORWARD = 90 + JKEYCODE_MEDIA_FAST_FORWARD = 90, + JKEYCODE_MEDIA_PLAY = 126, + JKEYCODE_MEDIA_PAUSE = 127 }; // five-way navigation control @@ -380,6 +382,19 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3, return; + case JKEYCODE_MEDIA_PAUSE: + case JKEYCODE_MEDIA_PLAY: + case JKEYCODE_MEDIA_PLAY_PAUSE: + if (arg1 == JACTION_DOWN) { + e.type = Common::EVENT_MAINMENU; + + lockMutex(_event_queue_lock); + _event_queue.push(e); + unlockMutex(_event_queue_lock); + } + + return; + case JKEYCODE_CAMERA: case JKEYCODE_SEARCH: if (arg1 == JACTION_DOWN) @@ -888,6 +903,10 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3, e.kbd.ascii = Common::ASCII_ESCAPE; break; + case JKEYCODE_BUTTON_Y: + e.type = Common::EVENT_MAINMENU; + break; + default: LOGW("unmapped gamepad key: %d", arg2); return; diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVMEvents.java b/backends/platform/android/org/scummvm/scummvm/ScummVMEvents.java index 32c65d3395..e81000d8b1 100644 --- a/backends/platform/android/org/scummvm/scummvm/ScummVMEvents.java +++ b/backends/platform/android/org/scummvm/scummvm/ScummVMEvents.java @@ -119,6 +119,8 @@ public class ScummVMEvents implements case KeyEvent.KEYCODE_MENU: case KeyEvent.KEYCODE_CAMERA: case KeyEvent.KEYCODE_SEARCH: + case KeyEvent.KEYCODE_MEDIA_PLAY: + case KeyEvent.KEYCODE_MEDIA_PAUSE: break; default: diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml index d605d9b3cc..14161668fe 100644 --- a/dists/android/AndroidManifest.xml +++ b/dists/android/AndroidManifest.xml @@ -15,6 +15,7 @@ <application android:label="@string/app_name" android:description="@string/app_desc" + android:isGame="true" android:icon="@drawable/scummvm"> <activity android:name=".ScummVMActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" @@ -27,6 +28,14 @@ <category android:name="tv.ouya.intent.category.GAME"/> </intent-filter> </activity> + <activity android:name=".ScummVMActivity" + android:theme="@android:style/Theme.NoTitleBar.Fullscreen" + android:banner="@drawable/leanback_icon"> + <intent-filter> + <action android:name="android.intent.action.MAIN"/> + <category android:name="android.intent.category.LEANBACK_LAUNCHER"/> + </intent-filter> + </activity> </application> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> @@ -42,4 +51,11 @@ <uses-configuration android:reqTouchScreen="stylus" android:reqKeyboardType="qwerty"/> + + <uses-feature android:name="android.hardware.touchscreen" + android:required="false" /> + + <uses-feature android:name="android.software.leanback" + android:required="false" /> + </manifest> diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in index d90e282e3d..de2f2d905e 100644 --- a/dists/android/AndroidManifest.xml.in +++ b/dists/android/AndroidManifest.xml.in @@ -15,6 +15,7 @@ <application android:label="@string/app_name" android:description="@string/app_desc" + android:isGame="true" android:icon="@drawable/scummvm"> <activity android:name=".ScummVMActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" @@ -27,6 +28,14 @@ <category android:name="tv.ouya.intent.category.GAME"/> </intent-filter> </activity> + <activity android:name=".ScummVMActivity" + android:theme="@android:style/Theme.NoTitleBar.Fullscreen" + android:banner="@drawable/leanback_icon"> + <intent-filter> + <action android:name="android.intent.action.MAIN"/> + <category android:name="android.intent.category.LEANBACK_LAUNCHER"/> + </intent-filter> + </activity> </application> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> @@ -42,4 +51,11 @@ <uses-configuration android:reqTouchScreen="stylus" android:reqKeyboardType="qwerty"/> + + <uses-feature android:name="android.hardware.touchscreen" + android:required="false" /> + + <uses-feature android:name="android.software.leanback" + android:required="false" /> + </manifest> diff --git a/dists/android/res/drawable-xhdpi/leanback_icon.png b/dists/android/res/drawable-xhdpi/leanback_icon.png Binary files differnew file mode 100644 index 0000000000..28a7196b7f --- /dev/null +++ b/dists/android/res/drawable-xhdpi/leanback_icon.png |
