397 Commits

Author SHA1 Message Date
Terence Burns
4904468eec Comment cleanup for GPS iap
[CL 2473853 by Terence Burns in Main branch]
2015-03-10 11:30:56 -04:00
Chris Babcock
8f8e3a233b Fix for force feedback issue on Android
#ue4
#android

[CL 2436243 by Chris Babcock in Main branch]
2015-02-06 17:57:32 -05:00
JJ Hoesing
c9c2b0fcd0 - Updated Oculus Mobile SDK to 0.4.2
- Moved vrlib.jar to the android build directory
- Fixed stereo translucent pass in ES2

[CL 2426328 by JJ Hoesing in Main branch]
2015-01-30 16:03:13 -05:00
Chris Babcock
eb605a14ab Add GooglePlay login timeout and pass on onActivityResult to GPG with delegate
#ue4
#android
#codereview Ryan.Gerleve,Bart.Bressler

[CL 2421296 by Chris Babcock in Main branch]
2015-01-27 18:30:20 -05:00
Josh Adams
7231a49511 - Moved OBBInAPK into ProjectSettings, and renamed it [UE-8359]
- Removed all the OBBInAPK hackery in UBT
- Updated the apk install scripts with some more information as to what it's doing [UE-8258]

[CL 2420664 by Josh Adams in Main branch]
2015-01-27 13:05:32 -05:00
Josh Adams
9cf8c67c77 - Generate AndroidManifest.xml from ProjectSettings
- Moved some Android settings to ProjectSettings, re-enabled SDK settings
- Removed SigningConfig.xml, and moved those settings into project settings
- Added concept of NotForLicensees and NoRedist engine and project config settings
- Removed BaseInternalGame.ini, replaced with NotForLicensees/BaseGame.ini
- Moved User*.ini to end of .ini hierarchy
- Added support for CLASS_GlobalUserConfig, so their settings will be saved to <AppData>/.../User*.ini (useful for SDK paths, etc)
- Enabled AndroidPlatformEditor module on Mac
- Changed Mac Build.sh to allow for Android on the commandline (just pass through if it's not an Xcode platform name)
- Iterative Android packaging now looks at just the important .ini sections, NOT entire .ini files

#codereview jamie.dale,james.moran,michael.trepka,robert.jones,chris.babcock

[CL 2413870 by Josh Adams in Main branch]
2015-01-21 11:17:55 -05:00
Chris Babcock
85709cb752 Fix for UE-7324 freeze with GooglePlay: Added wait for GooglePlay to steal focus after initialization, corrected an issue with return code for early touch events, and removed screen wakeup (caused Samsung freezes).
#android
#ue4
#codereview Rene.Rivera,Ryan.Gerleve

[CL 2411570 by Chris Babcock in Main branch]
2015-01-19 18:26:22 -05:00
Chris Babcock
4311402804 Fix for MessageBox class in ProGuard file
#ue4
#android
#codereview Rene.Rivera

[CL 2404068 by Chris Babcock in Main branch]
2015-01-12 18:32:03 -05:00
Chris Babcock
0cdd41eadd Fix proguard settings for new classes
#ue4
#android
#codereview Rene.Rivera

[CL 2401514 by Chris Babcock in Main branch]
2015-01-08 18:51:33 -05:00
Chris Babcock
4eff2db754 Protect against IAP not enabled in onActivityResult
#android
#ue4
#codereview Terence.Burns

[CL 2400223 by Chris Babcock in Main branch]
2015-01-07 16:20:04 -05:00
Rene Rivera
24d05774d3 [UE-7113] Don't use deprecated API for device unlocking on OS >= 3.2.
[CL 2398815 by Rene Rivera in Main branch]
2015-01-06 12:16:41 -05:00
Rene Rivera
2c49198a3e [UE-6843] Fix graphics streching problems when launchng on a non-keylocked screen-locked device. This moves the screen unlocking from UAT to the game itself. Which allows for proper screen wakeup and lock dismissal.
#codereview josh.adams, chris.babcock

[CL 2396541 by Rene Rivera in Main branch]
2015-01-05 08:49:14 -05:00
Ben Marsh
78735a771a Fix some 2014 copyright notices that have crept in.
[CL 2392643 by Ben Marsh in Main branch]
2014-12-18 11:47:29 -05:00
Chris Babcock
5a70492c7e Use a fixedfilename for OBB in APK (main.obb.png) instead of patching JavaBuildSettings.java
#android
#ue4
#codereview Josh.Adams

[CL 2384436 by Chris Babcock in Main branch]
2014-12-10 17:23:54 -05:00
Rene Rivera
7151751135 [UEPLAT-207] Support Message Boxes on Android.
#codereview josh.adams, chris.babcock

[CL 2384151 by Rene Rivera in Main branch]
2014-12-10 15:28:56 -05:00
Josh Adams
bcebbdfc0f - Cleaned up the Android JNI code
- Started on the work for a separate GooglePlay java class, but that's not in yet (notice: GoogleServicesThis = FJavaWrapper::GameActivityThis)
#codereview chris.babcock,jj.hoesing,robert.jones,rene.rivera

[CL 2383946 by Josh Adams in Main branch]
2014-12-10 13:54:08 -05:00
Chris Babcock
b03e11fec3 Improve Android startup load times
#android
#ue4
#codereview Josh.Adams,Rene.Rivera

[CL 2383581 by Chris Babcock in Main branch]
2014-12-10 10:57:50 -05:00
Ben Marsh
149375b14b Update copyright notices to 2015.
[CL 2379638 by Ben Marsh in Main branch]
2014-12-07 19:09:38 -05:00
Rene Rivera
8a8d83c447 [UE-6046] JNI errors when using ART runtime. Fixed various errors with JNI calls and references.. Moved build OS version to GameActivity to work around ART limitation. Fix FAndroidApplication::ClassLoader being a local ref instead of a global ref. Added exception check to FindJavaClass to find class lookup errors early. Fixed various local vs. global refs in FJavaClassObject.
#codereview Josh.Adams, Chris.Babcock

[CL 2374995 by Rene Rivera in Main branch]
2014-12-03 14:34:22 -05:00
Chris Babcock
7693375ed4 Close movie between queued movies and stop before reset to prevent possible runtime exception. Disable audio for media player plugin.
#android
#ue4
#codereview Josh.Adams,Rene.Rivera

[CL 2370349 by Chris Babcock in Main branch]
2014-11-25 18:01:58 -05:00
Rene Rivera
5223fbdb13 [UE-2977] Implement loading movie playback for Android for API 14 and above.
#codereview Josh.Adams, Chris.Babcock

[CL 2366457 by Rene Rivera in Main branch]
2014-11-20 13:01:20 -05:00
Terence Burns
3766264ae8 In-App Purchase changes.
Android fixes for workflow and threading issues.
Receipt is now returned as part of the IAP product information in blueprints
IAP workflow in blueprints now use an IAP request object as opposed to just a string.
Changes to the IOS workflow to accommodate receipts in product responses.
Android game activity has been updated to receive onActivityChanged messages. Needed for routing activity changes to android IAP.
A lot of threading fixes
Fixes for certain google events not calling the appropriate delegates.
Play store license key property added to runtime settings.

[CL 2364717 by Terence Burns in Main branch]
2014-11-19 05:18:19 -05:00
Rene Rivera
ffde9aa6b7 [UE-4398] Implement Android Media plugin, for API 14 an onwards, and packaging changes to support it. Changes include:
Fixed JavaVM so it is automatically detached from a thread when thread exits (stops VM crash on thread exit ever happening)
Move JavaVM access into the application code.
Add utility Java call-in class to make it easier to use Java objects from C++ side.
Implement GetSystemErrorMessage to aid in debugging.
Expose some internal Android EGL data for use in plugins (i.e. the movie plugin).
Add access to Java AssetManager object.
Change Android OBBs from plain PAKs to uncompressed ZIPs of the staged content to allow both multiple PAKs and to allow non-PAK content. In particular this allow movies to be in the OBB as they need to be directly accessed.

#codereview Josh.Adams, Chris.Babcock

[CL 2362008 by Rene Rivera in Main branch]
2014-11-17 11:31:49 -05:00
Terence Burns
16471ab514 Google licensing code. Was approved in a tps review. Needed for IAP.
[CL 2345497 by Terence Burns in Main branch]
2014-10-30 17:13:18 -04:00
Terence Burns
cd8819e072 Missing file from CL 2345308
[CL 2345458 by Terence Burns in Main branch]
2014-10-30 17:11:22 -04:00