diff options
| author | Eugene Sandulenko | 2016-10-25 19:43:50 +0200 |
|---|---|---|
| committer | GitHub | 2016-10-25 19:43:50 +0200 |
| commit | 97bc65e82f0f9efeb07d84a876ee2fd7f9b24780 (patch) | |
| tree | 14bd455b13d36be30692c2221ae54edc9cc60dca /dists/androidsdl | |
| parent | 1c370c96449f93c7f99308b643a891aa02c2ca0e (diff) | |
| parent | 55f37714cad5d990340b7fd2a9d4db4cba66d55c (diff) | |
| download | scummvm-rg350-97bc65e82f0f9efeb07d84a876ee2fd7f9b24780.tar.gz scummvm-rg350-97bc65e82f0f9efeb07d84a876ee2fd7f9b24780.tar.bz2 scummvm-rg350-97bc65e82f0f9efeb07d84a876ee2fd7f9b24780.zip | |
Merge pull request #854 from lubomyr/master
ANDROIDSDL: Changed logic for back button & getting sdcard storage location
Diffstat (limited to 'dists/androidsdl')
| -rw-r--r-- | dists/androidsdl/scummvm/AndroidAppSettings.cfg | 8 | ||||
| -rw-r--r-- | dists/androidsdl/scummvm/AndroidAppSettings.cfg.in | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg b/dists/androidsdl/scummvm/AndroidAppSettings.cfg index a4db29093f..c9b555bb42 100644 --- a/dists/androidsdl/scummvm/AndroidAppSettings.cfg +++ b/dists/androidsdl/scummvm/AndroidAppSettings.cfg @@ -125,7 +125,7 @@ NonBlockingSwapBuffers=n # SEARCH and CALL by default return same keycode as DPAD_CENTER - one of those keys is available on most devices # Use word NO_REMAP if you want to preserve native functionality for certain key (volume keys are 3-rd and 4-th) # Keys: TOUCHSCREEN (works only when AppUsesMouse=n), DPAD_CENTER/SEARCH, VOLUMEUP, VOLUMEDOWN, MENU, BACK, CAMERA -RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP ESCAPE LCTRL F7 F4 F2 MOUSE_LEFT" +RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP ESCAPE F13 F7 F4 F2 MOUSE_LEFT" # Number of virtual keyboard keys (currently 6 is maximum) AppTouchscreenKeyboardKeysAmount=0 @@ -134,10 +134,10 @@ AppTouchscreenKeyboardKeysAmount=0 AppTouchscreenKeyboardKeysAmountAutoFire=0 # Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right) -RedefinedKeysScreenKb="MOUSE_RIGHT F7 LCTRL" +RedefinedKeysScreenKb="MOUSE_RIGHT F7 F13" # Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu -RedefinedKeysScreenKbNames="MOUSE_RIGHT F7 LCTRL" +RedefinedKeysScreenKbNames="MOUSE_RIGHT F7 F13" # On-screen keys theme # 0 = Ultimate Droid by Sean Stieber (green, with gamepad joystick) @@ -148,7 +148,7 @@ TouchscreenKeysTheme=1 # Redefine gamepad keys to SDL keysyms, button order is: # A B X Y L1 R1 L2 R2 LThumb RThumb -RedefinedKeysGamepad="MOUSE_RIGHT F7 LCTRL ESCAPE F5 SPACE RETURN MOUSE_LEFT" +RedefinedKeysGamepad="MOUSE_RIGHT F7 F13 ESCAPE F5 SPACE RETURN MOUSE_LEFT" # How long to show startup menu button, in msec, 0 to disable startup menu StartupMenuButtonTimeout=3000 diff --git a/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in b/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in index dea60277df..59bb429261 100644 --- a/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in +++ b/dists/androidsdl/scummvm/AndroidAppSettings.cfg.in @@ -125,7 +125,7 @@ NonBlockingSwapBuffers=n # SEARCH and CALL by default return same keycode as DPAD_CENTER - one of those keys is available on most devices # Use word NO_REMAP if you want to preserve native functionality for certain key (volume keys are 3-rd and 4-th) # Keys: TOUCHSCREEN (works only when AppUsesMouse=n), DPAD_CENTER/SEARCH, VOLUMEUP, VOLUMEDOWN, MENU, BACK, CAMERA -RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP ESCAPE LCTRL F7 F4 F2 MOUSE_LEFT" +RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP ESCAPE F13 F7 F4 F2 MOUSE_LEFT" # Number of virtual keyboard keys (currently 6 is maximum) AppTouchscreenKeyboardKeysAmount=0 @@ -134,10 +134,10 @@ AppTouchscreenKeyboardKeysAmount=0 AppTouchscreenKeyboardKeysAmountAutoFire=0 # Redefine on-screen keyboard keys to SDL keysyms - 6 keyboard keys + 4 multitouch gestures (zoom in/out and rotate left/right) -RedefinedKeysScreenKb="MOUSE_RIGHT F7 LCTRL" +RedefinedKeysScreenKb="MOUSE_RIGHT F7 F13" # Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu -RedefinedKeysScreenKbNames="MOUSE_RIGHT F7 LCTRL" +RedefinedKeysScreenKbNames="MOUSE_RIGHT F7 F13" # On-screen keys theme # 0 = Ultimate Droid by Sean Stieber (green, with gamepad joystick) @@ -148,7 +148,7 @@ TouchscreenKeysTheme=1 # Redefine gamepad keys to SDL keysyms, button order is: # A B X Y L1 R1 L2 R2 LThumb RThumb -RedefinedKeysGamepad="MOUSE_RIGHT F7 LCTRL ESCAPE F5 SPACE RETURN MOUSE_LEFT" +RedefinedKeysGamepad="MOUSE_RIGHT F7 F13 ESCAPE F5 SPACE RETURN MOUSE_LEFT" # How long to show startup menu button, in msec, 0 to disable startup menu StartupMenuButtonTimeout=3000 |