Commit Graph

746 Commits

Author SHA1 Message Date
Sean Maas 9d54c472ae Android: scale buttons based on smaller screen dimension 2016-09-18 17:48:47 -04:00
Sean Maas d49b38a5c9 Android: remove unused files 2016-09-16 18:24:16 -04:00
Sean Maas 094470ead6 Android: fix save and load state menus on non-TV devices 2016-09-16 17:43:38 -04:00
sigmabeta 8724df3b70 Fix crash caused by trying to reference touch-screen config UI on devices without touchscreen 2016-07-30 09:33:35 -04:00
Ironthighs 1ad32ee382 -Commented out lines disabling lint translation messages. 2016-07-22 23:01:45 -05:00
Ironthighs 89b5bc9ee5 -Fixed some various coding standard issues from previous commit. 2016-07-22 23:01:45 -05:00
Ironthighs 3dfeea01da -Implemented ability to configure game controls by moving them around individually. Controls save locations once they are placed. 2016-07-22 23:01:45 -05:00
JosJuice 0a15aaaa12 Move DiscIO enums to a new file
At first there weren't many enums in Volume.h, but the number has been
growing, and I'm planning to add one more for regions. To not make
Volume.h too large, and to avoid needing to include Volume.h in code
that doesn't use volume objects, I'm moving the enums to a new file.
I'm also turning them into enum classes while I'm at it.
2016-07-13 17:29:27 +02:00
degasus d79aeaa1e9 VideoCommon: Drop GetConfigName.
We're past 5.0 now, so there is no need to look for old inis.
2016-06-26 12:34:59 +02:00
JosJuice 1878605d77 Undo some comment formatting changes from b5104a7 2016-06-25 18:07:10 +02:00
Rukai b5104a79f1 GCVolume: supports reading all opening.bnr information
DQT2: Game properties dialog contains info tab giving information about the selected iso.
2016-06-26 00:03:59 +10:00
spider-mario 9e82694071 Fix configStrings in Android’s ButtonManager
The bug was exposed by clang-format.
2016-06-24 22:36:15 +02:00
Pierre Bourdon 3570c7f03a Reformat all the things. Have fun with merge conflicts. 2016-06-24 10:43:46 +02:00
Mat M 08d45b9fea Merge pull request #3794 from EmptyChaos/frame-advance-race
Core: Add synchronization to state changes (Fix Frame Step and FIFO Player -  Issue 8718)
2016-05-22 15:19:16 -04:00
Tyler Dunn cf65199d86 [Android] Fix extra character in screenshot folder path
Environment.getExternalStorageDirectory().getPath() covers the end of the path with a slash, get rid of the extra slash to fix the path.
2016-05-20 15:24:49 -04:00
Tyler Dunn 4a0a92e95e [Android] Bump gradle plugin to 2.1.0
And fix deprecation warning in script
2016-05-18 22:31:54 -04:00
Tyler Dunn a5b72abf2c [Android] Reduce code redundancy 2016-05-18 22:13:33 -04:00
Tyler Dunn 937caea1c9 [Android] Drop commit() for apply()
Apply is asynchronous, and we aren't expecting a return value so there
is no reason not to use apply.
2016-05-18 22:10:52 -04:00
Tyler Dunn a0b54f558e [Android] Don't hardcode SD card path 2016-05-18 22:10:42 -04:00
Tyler Dunn 6a870c2417 [Android] Fix possible leak of fileCursor 2016-05-18 22:10:29 -04:00
JosJuice dc3bbeb92f Fix reading CISO files on Android 2016-05-17 14:20:59 +02:00
EmptyChaos c1944f623b Core/Movie: Add ability to run code in Host context
EndPlayInput runs on the CPU thread so it can't directly call
UpdateWantDeterminism. PlayController also tries to ChangeDisc
from the CPU Thread which is also invalid. It now just pauses
execution and posts a request to the Host to fix it instead.

The Core itself also did dodgy things like PauseAndLock-ing
from the CPU Thread and SetState from EmuThread which have been
removed.
2016-05-13 09:23:44 +10:00
EmptyChaos c1922783f8 Core: Threadsafety Synchronization Fixes (Frame Advance / FifoPlayer)
Fix Frame Advance and FifoPlayer pause/unpause/stop.

CPU::EnableStepping is not atomic but is called from multiple threads
which races and leaves the system in a random state; also instruction
stepping was unstable, m_StepEvent had an almost random value because
of the dual purpose it served which could cause races where CPU::Run
would SingleStep when it was supposed to be sleeping.

FifoPlayer never FinishStateMove()d which was causing it to deadlock.
Rather than partially reimplementing CPU::Run, just use CPUCoreBase
and then call CPU::Run(). More DRY and less likely to have weird bugs
specific to the player (i.e the previous freezing on pause/stop).

Refactor PowerPC::state into CPU since it manages the state of the
CPU Thread which is controlled by CPU, not PowerPC. This simplifies
the architecture somewhat and eliminates races that can be caused by
calling PowerPC state functions directly instead of using CPU's
(because they bypassed the EnableStepping lock).
2016-05-13 09:23:44 +10:00
degasus 2030ad4577 SCM: Use std::string.
Those macros may be defined, or not. We should support both cases, so use std::string as it also defines the length of the string.
2016-05-05 00:22:49 +02:00
degasus 3a4ff30745 Android: Also create directorys for the Wii files. 2016-04-24 14:44:30 +02:00
degasus 18db9498d7 Android: Check asset overwrite per file.
So new files will be added, eg the missed Wii directory.
2016-04-24 14:44:30 +02:00
degasus 3f704dca75 Android: Also copy sys/Wii directory.
Seems like this one was just missed, some games just did not start without it.
2016-04-24 14:44:30 +02:00
sigmabeta 57eea4f330 Fix android builds permanently. 2016-04-02 10:14:40 -04:00
degasus 6cd7740f4b Android: Update gradle version 2016-04-02 13:56:30 +02:00
Pierre Bourdon 2d1c0e4092 Merge pull request #3722 from Sonicadvance1/upgrade_to_new_MaJoR1
Update to MaJoR1's latest on screen buttons
2016-03-27 22:43:22 +02:00
Ryan Houdek 38a5183eb4 Fix Android buildbot 2016-03-12 15:44:13 -06:00
Ryan Houdek baee7f0d15 Update to MaJoR1's latest on screen buttons 2016-03-08 20:27:03 -06:00
Tyler Dunn 309b0c53bf [Android] Remove CPUHelper class 2016-03-04 16:17:41 -05:00
Ryan Houdek b57cb30c41 [Android] Make sure the file extension check isn't case sensitive 2016-03-03 08:29:51 -06:00
Pierre Bourdon 265c6408d6 Merge pull request #3686 from Armada651/revert-3578
Revert "Merge pull request #3578 from Armada651/forced-slow-depth"
2016-03-03 02:03:03 +01:00
Pierre Bourdon 8e1aff34df Merge pull request #3682 from Alcaro/master
Run pngout and zopflipng on every single PNG in this repo.
2016-02-29 17:27:29 +01:00
Alcaro da68dfc2f4 Use optipng too. 2016-02-29 17:08:18 +01:00
Ryan Houdek c82feb6c08 Merge pull request #3626 from Sonicadvance1/more_robust_gcadapter
Improve stability of the Wii U Gamecube Controller adapter under Android.
2016-02-29 09:54:01 -05:00
Jules Blok 6d1628eda4 Revert "Merge pull request #3578 from Armada651/forced-slow-depth"
This reverts commit e2a1a085b6, reversing
changes made to 2aea549eef.
2016-02-29 00:55:51 +01:00
Alcaro a79d9ccfa1 Run pngout and zopflipng on every single PNG in this repo. 2016-02-27 22:25:51 +01:00
Ryan Houdek 6513062144 Merge pull request #3596 from Sonicadvance1/fix_android_crash
[Android] Fix crash when we don't have access to a folder.
2016-02-22 16:15:54 -05:00
Jules Blok e2a1a085b6 Merge pull request #3578 from Armada651/forced-slow-depth
VideoConfig: Replace FastDepthCalc by ForcedSlowDepth.
2016-02-22 11:29:09 +01:00
Ryan Houdek 6cc40b1235 Improve stability of the Wii U Gamecube Controller adapter under Android.
Under failure conditions of the GC Adapter, When interface count is zero and we can't open the device.
Then there were race conditions on shutdown of the threads which could result in crashing.

Make adapter opening more robust like the Mayflash DolphinBar.
Make shutdown more robust by making the read thread control the write thread.
Make sure that there is actual data to be written when kicking the write thread. So it doesn't attempt a write a shutdown.
Make a toast on screen to tell the user that the adapter needs to be unplugged and plugged back in again for it to work.
2016-02-13 08:17:20 -06:00
sigmabeta c2d03e62e7 Add Wiimote graphic 2016-02-08 21:23:16 -05:00
sigmabeta dd4082f216 Add Wiimote Speaker option 2016-02-08 21:23:16 -05:00
sigmabeta 85cf07e87e Add Wiimote Input menu 2016-02-08 21:23:16 -05:00
Jules Blok fb2f8e49bb Android: Remove FastDepthCalc option. 2016-02-08 12:26:56 +01:00
Ryan Houdek fe53461611 [Android] Implement support for real Wiimotes with the DolphinBar
This is the only way to get Wiimotes working under Android now.
This, just like the Wii U Gamecube Controller Adapter, completely goes around Android's limitations and talks with the device directly through USBManager.

Couple notes.
Continuous scanning must be enabled otherwise the Wiimotes won't be seen.
The UI doesn't expose support for this yet. One must change the Wiimote source and continuous scanning settings manually.

Testing up to two wiimotes in Taiko No Tatsujin, no reason to believe all four won't work.
2016-02-07 05:31:48 -06:00
Ryan Houdek 07434e3a65 [Android] Fix crash when we don't have access to a folder. 2016-02-05 22:03:33 -06:00
sigmabeta 7542eafd58 Fix capitalization on "GameCube" strings 2016-01-31 10:17:30 -05:00
sigmabeta 93056e3988 Change SettingsActivity label to "Settings" instead of "CPU Settings" 2016-01-31 10:06:00 -05:00
sigmabeta 9215878868 Add some stability fixes, though probably not enough 2016-01-30 10:24:44 -05:00
sigmabeta bc03bbccf1 Make necessary modifications to Java_GCAdapter for permissions request 2016-01-30 10:10:15 -05:00
sigmabeta 6115d39a7a Implement Gamecube Input setting screen 2016-01-29 23:33:06 -05:00
Ryan Houdek f1ca95eec7 Merge pull request #3553 from Sonicadvance1/more_android_gc_adapter
Implement requesting permission for using the GC Wii U Adapter.
2016-01-29 23:12:37 -05:00
Ryan Houdek b846ec084e Implement requesting permission for using the GC Wii U Adapter. 2016-01-27 15:08:45 -06:00
sigmabeta 28bcd2636b Fix CPU Core selection on x86-64 devices (really, just the Android emulator) 2016-01-25 09:28:57 -05:00
sigmabeta 96e7f774ae Fix rotations in Settings screen breaking everything 2016-01-25 09:28:57 -05:00
sigmabeta fb04622039 Fix bugs in Setting screen & add a way to exit without saving 2016-01-24 19:31:34 -05:00
sigmabeta cf7f5d078b Fix accessing video settings on Android TV 2016-01-24 10:04:06 -05:00
sigmabeta 04974835d6 Add fragment transition animations to the Settings UI screen 2016-01-23 17:00:54 -05:00
sigmabeta 2190496ce8 Fix special case for XFB & update EFB to match desktop 2016-01-23 12:28:51 -05:00
sigmabeta cee84d8e90 Cleanup and documentation 2016-01-23 12:28:51 -05:00
sigmabeta d90dce6d12 Implement video settings + support for missing files / settings 2016-01-23 12:28:51 -05:00
sigmabeta c8e4008b83 Implement Seekbar dialog and SingleChoice dialog 2016-01-23 12:28:50 -05:00
sigmabeta ce8a3d9bfb Implement basic framework for new Settings UI 2016-01-23 12:28:50 -05:00
sigmabeta e49f9b10a8 Implement Java-based Config file read/save 2016-01-23 12:28:50 -05:00
Ryan Houdek ba8dc2cef3 Merge pull request #3517 from sigmabeta/android-animation-refactor
[Android] Refactor animations
2016-01-22 06:24:57 -05:00
sigmabeta 11fb26afa1 Fix android builds 2016-01-21 22:55:51 -05:00
Ryan Houdek c399eefdaa Strip the Android shared library file.
This cuts down the shared library size from ~11MB to ~5.5MB
2016-01-20 10:40:42 -06:00
sigmabeta 85ef16a75a Create static helper methods for pixel-to-DP conversion 2016-01-16 10:33:59 -05:00
sigmabeta d677f9ce16 Externalize animation code into static methods 2016-01-16 10:33:59 -05:00
Ryan Houdek 0271f05ab8 Merge pull request #3492 from sigmabeta/android-update-build-tools
[Android] Update build tools + support libraries
2016-01-13 16:35:52 -05:00
sigmabeta 5fef956384 Prevent screenshot from showing on EmulationActivity rotation events 2016-01-12 10:33:00 -05:00
sigmabeta 5f43976b10 Create a static Log class to call into instead of the default android one 2016-01-12 09:54:19 -05:00
Ryan Houdek bd31b1411b Merge pull request #3493 from sigmabeta/android-tv-screenshot-bugfix
[Android] Minor refactor + bugfix
2016-01-11 16:04:56 -05:00
Ryan Houdek 78bb37b29f Merge pull request #3494 from Sonicadvance1/android_rotation
[Android] Add support for rotation and minimizing the application
2016-01-11 01:18:37 -05:00
Ryan Houdek 5a549ef663 [Android] Add support for rotation and minimizing the application 2016-01-10 13:00:32 -06:00
Ryan Houdek d17bcbb489 [Android] Pause and resume emulation using proper functions 2016-01-10 12:23:40 -06:00
sigmabeta db0a923083 Refresh screenshots in TvMainActivity after emulation complete 2016-01-10 13:18:20 -05:00
sigmabeta 7ff558886a Refactor EmulationActivity to be launched exclusively by its static launcher method 2016-01-10 13:00:01 -05:00
sigmabeta e34abd5739 Move TvMainActivity to ui.main package 2016-01-10 12:10:02 -05:00
sigmabeta 13f336051f Update build tools + support libraries 2016-01-10 10:58:12 -05:00
sigmabeta df2f783a77 Refactor PlatformGamesFragment to MVP structure 2016-01-10 10:37:32 -05:00
sigmabeta a455305c23 Refactor AddDirectoryActivity and SettingsActivity to be launched exclusively via their own launcher method 2016-01-09 23:35:25 -05:00
sigmabeta 24efce4cea Refactor TvMainActivity to MVP architecture 2016-01-09 20:32:10 -05:00
sigmabeta 81657b6710 Refactor MainActivity to MVP architecture 2016-01-09 18:08:04 -05:00
sigmabeta f58a8561f8 Refactor DB read code to use RxJava 2016-01-09 13:10:22 -05:00
Pierre Bourdon dd1192b709 Merge pull request #3449 from freelancer42/android_finish_main_activity_after_autostartfile
StartupHandler.java: Finish main activity if AutoStartFile is specified in intent
2016-01-07 00:50:47 +01:00
Pierre Bourdon e668fd7a02 Merge pull request #3465 from Sonicadvance1/Android_move_jni
Move Android JNI bits from DolphinWX to the Android folder.
2016-01-07 00:47:39 +01:00
Ryan Houdek 74478addeb Move Android JNI bits from DolphinWX to the Android folder. 2016-01-06 15:36:44 -06:00
Ryan Houdek 7fcb5a803b Merge pull request #3359 from degasus/ini
VideoConfig: Use "GFX.ini" for both D3D and OGL.
2016-01-06 16:02:23 -05:00
degasus ad1f7576ad VideoConfig: Use "GFX.ini" for both D3D and OGL.
They share the same format, so there is no need to separate their configs.
2016-01-06 21:43:11 +01:00
Ryan Houdek e3da564418 Merge pull request #3440 from Sonicadvance1/Android_WiiU_Adapter
[Android] Disable screen lock when a title is running.
2016-01-06 15:42:25 -05:00
Ryan Houdek 342496563d Merge pull request #3455 from Sonicadvance1/GC_adapter_android
[Android] Add support for the Wii U Gamecube adapter under Android.
2016-01-06 15:07:09 -05:00
Ryan Houdek 1a207b06ae [Android] Fix enabling and disabling Gamecube controllers. 2016-01-06 11:54:46 -06:00
Ryan Houdek e62503c873 [Android] Add support for the Wii U Gamecube adapter under Android.
No way to properly enable it from an end user perspective yet.
Doesn't require root.
This same sort of system can be used for the Dolphinbar in the future for real wiimote support.
2016-01-06 01:10:54 -06:00
Kim Johnsson 204201bcbc StartupHandler.java: Finish main activity if AutoStartFile is specified in intent
Call finish() on parent (main/browser) activity after starting EmulationActivity if AutoStartFile was specified. This makes the experience more streamlined for users who want to start games from an external frontend, since they don't expect to return to the Dolphin main activity after they've played their game.
2016-01-05 13:55:30 +01:00
Phatcat b2ad0d0793 Android: 4k Internal Resolution support
Adds two more internal resolution options (including 4k) to the Android
configurations
2016-01-04 13:36:06 +01:00
Phatcat f62054e467 Android: More analog input configurations
Lets the user set the following in intervals of 10 between 10 and 100;
- Stick/Radius (default 100,000000)
- Triggers/Threshold (default 90,000000)
- Tilt/Modifier/Range (default 50,000000) + mapped Tilt/Modifier button
to the configurations for wiimotes & nunchuks
2016-01-04 13:35:04 +01:00
Phatcat 158f0e8102 Android: Added categories to input controls
- Seperates input configurations into categories
- Reworked input configurations to reuse more strings
2016-01-04 13:19:44 +01:00
Phatcat cfe8400cdd Android: Revision of PR 3253 (Wiimote controls)
- Fix small error in NativeLibrary (line 141)
- Fix faulty indentment in arrays.xml
- Rework numbering system to be more accessible.
2016-01-04 13:19:42 +01:00
sigmabeta b882a79322 Add support for the CPU Clock Override feature to Android UI 2016-01-03 16:46:29 -05:00
Ryan Houdek 6e60dc60e0 [Android] Disable screen lock when a title is running.
Encountered this when testing out the Wii U Gamecube Adapter.
2016-01-03 09:42:41 -06:00
Ryan Houdek e77d454b8b [Android] Add support for launching a game through activity monitor.
This also allows setting the user directory.
This is mainly for FifoCI in the future.
2016-01-01 08:57:19 -06:00
Jules Blok 2c5965be88 UserPreferences: Move all stereoscopy options to the stereoscopy section. 2015-12-22 23:16:28 +01:00
Phatcat ca9c9b7135 Wiimote + Extensions for Android 2015-12-02 21:58:54 +01:00
JosJuice cbd539eb3d Use official names for GameCube controller sticks
Main Stick is changed to Control Stick and C-Stick is changed to C Stick.

A new ui_name variable is added to ControlGroup so that the UI strings
in DolphinWX can be updated without breaking backwards compatibility
with config INIs and other things that use names as IDs.
2015-09-12 22:45:06 +02:00
Ryan Houdek c319fbb98d Merge pull request #3013 from aserna3/Security101
Removed fastmem from Android UI
2015-09-11 09:14:50 -04:00
Anthony Serna cbd7b0793f Removed fastmem from Android UI 2015-09-09 14:46:20 -07:00
degasus 74b20e627c VideoCommon: Drop "Disable destAlpha" hack
This option has no use any more, neither performance nor driver workaround.
2015-09-09 21:31:54 +02:00
Ryan Houdek 9bb63bf2eb [Android] Fix multi-gamecube controller input, config changes 2015-09-04 20:06:01 -05:00
sigmabeta 6d6cb12b15 Android: Remove "fitSystemWindows" flag from MainActivity layout 2015-08-06 08:34:21 -04:00
sigmabeta dc1f7aeb66 Android: Include newer versions of support libraries, which contain bugfixes 2015-08-06 08:26:31 -04:00
sigmabeta 6f27ad67e7 Android: Allow usage of Cached Interpreter core. 2015-07-28 17:16:14 -04:00
Ryan Houdek e805e05ff5 Merge pull request #2773 from sigmabeta/android_wiimote_main
Android: Add Wiimote support, including configuration UI.
2015-07-26 16:54:45 -05:00
sigmabeta e7f98c7f95 Android TV: Add first-run copy operations to TvMainActivity. 2015-07-25 14:09:58 -04:00
sigmabeta 245b58124e Android TV: Add settings row, enabling access to other screens. 2015-07-25 12:26:31 -04:00
sigmabeta 0b1212b77d Android TV: Add row listing all games 2015-07-25 12:26:31 -04:00
sigmabeta 7c14996e3e Android TV: Implement game selector activity in new Android TV UI 2015-07-25 12:26:31 -04:00
sigmabeta a8aa19f1fa Android: Implement UI for configuration of all 4 Wiimotes. 2015-07-25 11:26:18 -04:00
sigmabeta 1cb07b1c48 Android: Wiimote UI Fixup 2015-07-23 23:17:16 -04:00
sigmabeta 008ac0eeb0 Android: Add UI for Wiimote configuration. 2015-07-23 22:11:11 -04:00
Ryan Houdek a8227ad9b1 Add Wiimote support to the Android backend.
Not actually wired up to the Android UI for configuration.
2015-07-21 21:33:23 -05:00
Ryan Houdek 3163602157 Merge pull request #2688 from sigmabeta/android-tv-ingame-menu
Android TV: Replace toolbar on EmulationActivity with a full-screen menu
2015-07-21 12:52:21 -05:00
sigmabeta 12fd46e12d Android TV: Add title text to in-game menu, and make the menu scrollable. 2015-07-14 17:45:00 -04:00
sigmabeta c0315fcf78 Android TV: Implement Save and Load state menus 2015-07-14 17:45:00 -04:00
sigmabeta d191d8851a Android TV: Visual tweaks & glitch fixes 2015-07-14 17:45:00 -04:00
sigmabeta 9dd4cee1b7 Android TV: Fix a layering issue on the ingame menu 2015-07-14 17:45:00 -04:00
sigmabeta 957691444d Android TV: Replace toolbar on EmulationActivity with a full-screen menu. 2015-07-14 17:45:00 -04:00
sigmabeta 658c49fab3 Android:Changes to simplify command-line building of the app, and bugfixes to the Gradle script 2015-07-13 09:37:44 -04:00
sigmabeta 3ad151062b Android TV: Game selection screen highlights games with accent color. 2015-07-03 13:46:54 -04:00
sigmabeta fd82f90fce Android: Show transition animation when exiting game. 2015-06-26 15:01:23 -04:00
sigmabeta 0fcf0e1d21 Android: Show transition animation while game loads. 2015-06-26 08:32:51 -04:00
sigmabeta 0679e43efe Android: Show screenshot on EmulationActivity before game starts. 2015-06-25 21:43:00 -04:00
sigmabeta e970f757d0 Android: Don't crash trying to hide toolbar in game. 2015-06-24 22:53:33 -04:00
sigmabeta 8ca620db7f Android: Invalidate Picasso screenshot cache every time a screenshot is displayed. 2015-06-23 22:36:27 -04:00
sigmabeta a028805626 Android: Save screenshot at end of an emulation session. 2015-06-23 22:22:01 -04:00
sigmabeta 6b24b604e5 Android: MainActivity now contains a tab switcher separating games by platform. 2015-06-23 21:54:09 -04:00
sigmabeta 8b5b83c29a Android Refactor: GameGridActivity is now MainActivity, and uses a Toolbar that reacts to the game grid scrolling. 2015-06-23 21:54:09 -04:00
sigmabeta fa2d06e7a4 Android: Switch all activities to AppCompat-based Material themes, and use Support Library version of Floating Action Button. 2015-06-23 21:54:02 -04:00
Ryan Houdek bb89a81053 Merge pull request #2635 from sigmabeta/android-seriously-now
Android: Remove Low and Medium DPI versions of all images.
2015-06-23 20:47:16 -05:00
Ryan Houdek 52aa9c05bd Merge pull request #2633 from sigmabeta/android-emulation-menu
Android: Add Quicksave/Load functionality, and cleanup in-game menu.
2015-06-23 20:47:10 -05:00
sigmabeta ac1f309b2c Android: Remove Low and Medium DPI versions of all images. 2015-06-20 18:18:06 -04:00
sigmabeta 92c954c463 Android: Add Quicksave/Load functionality, and cleanup in-game menu. 2015-06-20 12:34:03 -04:00
sigmabeta 2bdf6537c8 Android: Have non-games use their filename as a Game ID. 2015-06-19 09:15:31 -04:00
sigmabeta 0c993ad4a9 Android: Fix a bug making Input Overlay config screen only work in release OR debug builds, but not in both. 2015-06-16 15:42:11 -04:00
sigmabeta 82dea170cf Android: Don't delete the Input Overlay configuration screen. 2015-06-16 10:12:51 -04:00
Ryan Houdek 094c6bf5bc Merge pull request #2601 from Sonicadvance1/android_fix_user_directory
[Android] Make sure we are setting the default user directory.
2015-06-14 17:03:55 -05:00
Matthew Parlane 252c719515 Merge pull request #2600 from Sonicadvance1/Android_remove_dialog
[Android] Remove dialog telling individuals that their drivers are terrible.
2015-06-14 15:17:03 +10:00