Commit Graph

806 Commits

Author SHA1 Message Date
Mahdi Hijazi d19f9038da Fix menu actions on Android TV
Saving screenshot was not working due to 2 problems. The first one is that
the view id of the save screenshot in the Android TV fragment doesnt match
the one declared inside the menu_emulation. Second Problem will be fixed
in another commit.

This commit chnage the code to not depend on reusing the ids of the menu
everywhere in the emulator inorder for the onMenuItemClicked to work.
Instead you need to call EmulationActivity.handleMenuAction passing
the action to handle regardless of the ids you are using in the view.
2017-03-18 22:08:32 +01:00
Markus Wick 489d90b6f3 Merge pull request #4999 from stenzek/renderer-statics
VideoCommon: Eliminate static state in Renderer
2017-03-08 11:02:20 +01:00
degasus a3f79f88cd Android: Update android studio + gradle.
Android studio 2.3 finally displays the result of the native compilation, so C++ warnings are now shown in the build log.
2017-03-04 15:53:40 +01:00
Stenzek 459a5ab554 Android: Move screenshot waiting logic to Renderer 2017-03-04 16:53:16 +10:00
Stenzek afc25fdca0 VideoCommon: Rename Renderer s_ prefixes to m_ 2017-03-04 16:42:21 +10:00
Markus Wick 56afabb9a8 Merge pull request #4919 from ntruhan/master
Android: Sort configuration ini files
2017-03-03 00:39:12 +01:00
Lioncash beec40f178 IniFile: Handle s64/u64 values 2017-02-25 00:03:20 -05:00
ntruhan 3d8ab184ac Android: Sort configuration ini files 2017-02-16 13:08:00 -05:00
Lioncash e07383a783 Core: Convert State enum into an enum class 2017-02-05 08:32:23 -05:00
Florent Castelli fa04c1479e cmake: Remove PCH support
Compilers are very picky and don't use PCH when they have been compiled
with different flags. I even got some ICE in MSVC, so removing them for now.

Modules are the solution.
2017-01-24 03:22:03 +01:00
Michael Maltese 21ae6afa73 Android: remove unused android.toolchain.cmake
Gradle automatically sets up the CMake build and this file isn't referenced
anywhere.
2017-01-22 16:54:08 -08:00
Sarkie 8c5c7f8d2a Updated gradle to latest version 2017-01-17 10:19:39 +00:00
Sean Maas cc29691875 Android: Change Exit Without Saving to Save and Exit 2017-01-10 17:12:42 -05:00
Tillmann Karras 7284c7a954 Android: fix software renderer 2nd edition 2017-01-09 11:58:19 +00:00
Tillmann Karras 7e21732b53 Android: fix software renderer settings string 2017-01-08 17:28:14 +00:00
JosJuice 9bd514ed1c Add TGC disc image compatibility 2016-12-18 18:57:36 +01:00
Sean Maas 8647639746 Android: Fix Wii bindings resetting everything 2016-11-29 22:27:40 -05:00
Sean Maas a90731e2ae Android: Add input binding menus 2016-11-26 18:29:33 -05:00
Sean Maas d10b336b0a Android: Add InputBindingSetting class
Also update MotionAlertDialog to work with the new setting, and remove the
old InputBindingPreference.
2016-11-26 18:29:25 -05:00
Sean Maas 128c1f04ad Android: Specify ini file for every setting
Load all the inis at once, choose which one to write to, and save them all
at the same time. This allows us to modify settings from different files
on the same settings page.
2016-11-14 18:34:06 -05:00
Markus Wick 6a2e1e9986 Merge pull request #4429 from SeannyM/android-invert-settings
Android: Fix inverted EFB settings
2016-11-14 10:07:10 +01:00
Jules Blok aab6b70868 MainAndroid: Remove obsolete Host_RequestFullscreen() function 2016-11-11 20:48:19 +01:00
Jules Blok 8203ea929b BlockingLoop: Yield to UI message pump while waiting. 2016-11-11 13:37:02 +01:00
Sean Maas beff65854a Android: Fix inverted EFB settings 2016-11-06 12:50:56 -05:00
Pringo 93bdab64fa Change "Wiimote" to "Wii Remote" in Logs 2016-11-03 17:58:28 -07:00
Markus Wick 1c9ed79c6a Merge pull request #4409 from sigmabeta/android-tv-screenshot-errors
[Android TV] Fix a screenshot glitch on game selector
2016-10-31 23:34:41 +01:00
Markus Wick 4f5d0cd450 Merge pull request #4391 from Pringo/wii-remote
Change "Wiimote" to "Wii Remote" in Interface
2016-10-31 12:49:16 +01:00
Markus Wick d5ca153c26 Merge pull request #4401 from JosJuice/rename-getuniqueid
DiscIO/SConfig: Rename GetUniqueID to GetGameID
2016-10-31 12:39:27 +01:00
sigmabeta 64cf56dda3 Clear screenshot in game grid before attempting to render on Android TV devices 2016-10-30 18:53:57 -04:00
JosJuice 1081497cad DiscIO/SConfig: Rename GetUniqueID to GetGameID
We call this "game ID" everywhere else, and it's not
actually completely unique.
2016-10-29 15:24:02 +02:00
Markus Wick 838b234317 Merge pull request #4389 from SeannyM/android-dir-restrict
Android: Allow accessing all folders
2016-10-26 08:49:27 +02:00
Pringo 4bd5674b85 Change "Wiimote" to "Wii Remote" in Interface
The usage of "Wii Remote" and "Wiimote" in the interface is inconsistent. "Wiimote" is also not a real word nor is it an official product name. Therefore I have changed instances of "Wiimote" in the UI to instead say "Wii Remote". I also made a couple of minor grammatical changes as well.

This is mostly a resubmission of #4338 but there are some minor other changes as well.
2016-10-25 19:49:41 -07:00
Sean Maas f257c3385b Android: Fix screenshots on game list 2016-10-25 22:25:34 -04:00
Sean Maas 351825aa10 Android: Allow accessing all folders 2016-10-25 21:55:31 -04:00
Sean Maas 9eb0ab936f Android: Remove Japanese strings
These were very outdated and unmaintained.
2016-10-25 14:20:19 -04:00
Sean Maas 68affd37a1 Android: Remove unused stuff 2016-10-25 14:20:15 -04:00
Sean Maas 3b28fe11d6 Android: Cleanup formatting 2016-10-25 14:18:06 -04:00
Sean Maas 12db4e4882 Android: Fix "up one level" button 2016-10-24 23:16:51 -04:00
shuffle2 720cb34573 Merge pull request #4347 from SeannyM/android-wii-control
Android: On-screen classic controller + Wii controller select
2016-10-15 22:51:27 -07:00
Sean Maas 662cedfb78 Android: Fix some settings 2016-10-15 23:14:48 -04:00
Sean Maas f981098438 Android: On-screen classic controller + Wii controller select
It's now possible to switch between a horizontal or vertical Wiimote
with no extension, a Wiimote with a Nunchuk, a Classic Controller,
or a GameCube Controller when running a Wii game.
2016-10-13 21:31:36 -04:00
Sean Maas 126117cdf7 Android: Use the light theme for emulation 2016-10-12 22:45:03 -04:00
Sean Maas 05f78a7707 Android: Add custom control scaling
Also put all touch control settings under a "Configure Controls" submenu
so the in-game menu isn't so cluttered.
2016-10-09 19:00:32 -04:00
sigmabeta 01b8a937ff Fix games being invisible in the game list on non-TV devices 2016-10-08 08:57:32 -04:00
degasus 05eff01229 Android: Update the gradle file to use android studio 2.2 cmake. 2016-10-05 23:44:10 +02:00
Stenzek 4a4f6cc135 Android: Add video backend choice to settings 2016-10-01 02:40:02 +10:00
Stenzek 6a99cbd9fc VideoCommon: Call Renderer::SurfaceChanged on render parent resize
This is needed because for some reason the WSI for NV Vulkan drivers
doesn't return VK_ERROR_OUT_OF_DATE_KHR, so there is no other way to know
that a resize has occured apart from polling, which is a poor solution for
X11 (since it is blocking).
2016-10-01 01:09:12 +10:00
Sean Maas a317953ad4 Android: More accurate button scaling
Also scale based on button ID for consistency.
2016-09-29 21:46:46 -04:00
Sean Maas 313be655f4 Android: Option to toggle on/off individual buttons 2016-09-29 20:06:59 -04:00
Sean Maas 50b44fa337 Android: More on-screen buttons
GameCube now has a c-stick. For Wii games, there is now a Wiimote + Nunchuk setup.
2016-09-29 20:06:59 -04:00
Sean Maas bd99b318e5 Android: Add on-screen dpad support 2016-09-29 20:06:59 -04:00
Sean Maas c24a22e30f Android: Use button IDs to save screen layout
Using the drawable caused problems such as not being able to have multiple joysticks.
2016-09-29 20:06:59 -04:00
MaJoR daac4c4ae9 Adding forgotten wiimote home button
Ooops, forgot something. This adds the home button, that's all.
2016-09-28 23:28:44 -07:00
Markus Wick dc40e75642 Merge pull request #4248 from SeannyM/android-left
Android: Fix Wiimote left button
2016-09-26 08:52:46 +02:00
Sean Maas 6ca8974b13 Android: Fix Wiimote left button 2016-09-25 21:05:40 -04:00
MaJoR df5ea3d292 Adds Android Wiimote button images.
These were made when the button images were first remade many months ago, but they were never committed since there was no use for them at the time (and laziness :P). BUT now there is a PR that finally has use for these images, so it's time to get this into Dolphin and available for use!
2016-09-23 02:25:31 -07:00
Markus Wick 023eb34247 Merge pull request #4229 from SeannyM/android-joystick
Android: fix joystick saving incorrect y-coordinate
2016-09-20 07:03:15 +02:00
Sean Maas 001afae420 Android: fix joystick saving incorrect y-coordinate 2016-09-19 18:03:30 -04:00
Markus Wick 90ab952588 Merge pull request #4219 from SeannyM/android-state
Android: fix save and load state menus on non-TV devices
2016-09-19 22:32:05 +02:00
Markus Wick 0e2ec349ad Merge pull request #4221 from SeannyM/android-cleanup
Android: remove unused files
2016-09-19 22:30:20 +02:00
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