Commit Graph

64 Commits

Author SHA1 Message Date
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
Terence Burns
bccbbc9e5a In App Purchases Google Play.
- IAP added using the google play billing helper functionality
- App Licensing Key and checking added, but not yet used.

- Changes to Store purchases to allow consumable flags.
- New maps added for android testing, this uses static responses for IAP purchase testing.

A few improvements left
- need licensing working for the query process.
- need testing without static responses. Work with google test responses.

[CL 2345308 by Terence Burns in Main branch]
2014-10-30 17:06:50 -04:00
Josh Adams
b3d5cf5e5c - Big cleanup of Android packaging optimization, made it more safe (adds a few seconds)
- Made java library handling programmatic, no more hardcoding googleplayservices (just put your lib in <Project>\\Build\\Android\\JavaLibs like we have google now in Engine\\Build\\Android\\Java\\JavaLibs)
#codereview chris.babcock,ryan.gerleve

[CL 2345079 by Josh Adams in Main branch]
2014-10-30 12:30:32 -04:00
Josh Adams
b87a67f286 Rollback //depot/UE4/Engine/Build/Android/Java/proguard-project.txt to revision 6
[CL 2341581 by Josh Adams in Main branch]
2014-10-27 17:08:16 -04:00
Josh Adams
6ca46f77c0 - Upgraded to support API 21 (Android 5.0, Lollipop)
- Lots of Android iteration speedups:
   - When compiling from UBT (Visual Studio) perform incremental APK generation - it doesn't wipe the Intermadiate/APK directory between runs
   - Don't update project settings every run:
      - Looks at the project.properties for both game and google play services to make sure they are built with current SDK API version, if not, fixup project.properties, etc
   - Even with a non-incremental build (from Editor/UAT), keep the pre-dexed libraries (currently GooglePlayServices [GPS] only) for HUGE speedup
   - We can't just pre-dex GPS and check-in, that's not going to be safe with different java/SDK versions.
   - Removed the project.properties and proguard-project.txt from p4, as they will be generated if needed. A game can pre-supply those if needed, but we will still check API version and update if required
#codereview chris.babcock,ryan.gerleve,michael.noland

[CL 2341079 by Josh Adams in Main branch]
2014-10-27 13:07:43 -04:00
JJ Hoesing
22f3cbb2fe - Initialize Android VR HMDs from the Java UI thread.
- The Native->Java->JavaUI->Native callback could probably be made more generic than this.

[CL 2335076 by JJ Hoesing in Main branch]
2014-10-20 19:15:50 -04:00
Ryan Gerleve
65ea708ade Add more ProGuard exceptions, for the Google Play Games C++ SDK
Fixes TTP 347366 and "for distribution" Android builds

[CL 2318076 by Ryan Gerleve in Main branch]
2014-10-02 19:09:23 -04:00
Ryan Gerleve
4bbfa19d27 Add Android support library, used by Google Play services SDK
Fixes building "For distribution" packages for Android

[CL 2314378 by Ryan Gerleve in Main branch]
2014-09-30 11:39:03 -04:00
Chris Babcock
fe7da34aec Removed Vibrator.hasVibrator() check since it was added in API11
#ue4
#Android

[CL 2307395 by Chris Babcock in Main branch]
2014-09-23 16:40:36 -04:00