Commit Graph

214 Commits

Author SHA1 Message Date
jack porter
eb889271a3 Fixed issue with streaming video timestamps on Android causing the stream not to play.
#rb [at]Andriy.Tylychko

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 6684555 via CL 6684558 via CL 6684745 via CL 6684749
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6794584 by jack porter in Dev-Anim branch]
2019-06-03 08:28:28 -04:00
chris babcock
9e0f0a0089 Fix version checked for OBB to always match manifest version code
#android
#rb trivial


#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 6672175 via CL 6672194 via CL 6672197 via CL 6672201 via CL 6672203 via CL 6673471 via CL 6674115
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6788786 by chris babcock in Dev-Anim branch]
2019-06-03 06:49:28 -04:00
pete procopio
c15d7c4632 FORT-178943:Some notifications are missing the expected icon
#rb:Chris.Babcock
#jira:FORT-178943
#android
#kairos

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: pete.procopio
#ROBOMERGE-SOURCE: CL 6664591 via CL 6664592 via CL 6664594 via CL 6664596 via CL 6664598 via CL 6667332 via CL 6667473
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6783874 by pete procopio in Dev-Anim branch]
2019-06-03 05:44:40 -04:00
chris babcock
5284540c64 Added option to required permissions to only ask if in a list of specified device manufacturers
#android
#rb trivial


#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 6661506 via CL 6661507 via CL 6661508 via CL 6661509 via CL 6661703 via CL 6661712
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6760995 by chris babcock in Dev-Anim branch]
2019-05-31 20:31:25 -04:00
chris babcock
bcafeb09a8 Fix local notifications for Android
#android
[FYI] josh.adams
#rb josh.adams


#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 6633550 via CL 6633552 via CL 6635808 via CL 6637213 via CL 6637367
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6753505 by chris babcock in Dev-Anim branch]
2019-05-31 18:28:42 -04:00
josh adams
be7461b7d8 - Cleaned up the LocalNotification service code on IOS and Android, and allow for canceling a notification by ID
- Android ID changes untested yet
#rb michael.kirzinger
[FYI] michael.kirzinger,chris.babcock

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 6628745 via CL 6628746 via CL 6628747 via CL 6632036 via CL 6632203
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6749014 by josh adams in Dev-Anim branch]
2019-05-31 18:07:36 -04:00
justin marcus
3feacff421 Add functions for native code to log using embedded UE4
[at]Chris.Babcock

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: justin.marcus
#ROBOMERGE-SOURCE: CL 6594671 via CL 6594673 via CL 6595137 via CL 6595188
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v363-6677109)

[CL 6705874 by justin marcus in Dev-Anim branch]
2019-05-31 13:32:15 -04:00
chris babcock
33292ec907 Add support for UPL to insert a finalizing section at end of onCreate (gameActivityOnCreateFinalAdditions)
Optionally append to version name from an environment variable (UEAndroidDisplayNameExtra)

#android
[FYI] Andrew.Grant
#rb Pete.Procopio


#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 6278852 via CL 6278853 via CL 6289873 via CL 6290342
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6305438 by chris babcock in Dev-Anim branch]
2019-05-03 21:27:50 -04:00
chris babcock
e5f0b27db8 Handle required permissions at startup in SplashActivity with better flexiblity
#ue4
#android
[FYI] Pete.Procopio,Michael.Kirzinger,Jack.Porter
#rb Pete.Procopio


#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 6265053 via CL 6265056 via CL 6265059 via CL 6273019 via CL 6273099
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6287418 by chris babcock in Dev-Anim branch]
2019-05-03 17:45:41 -04:00
chris babcock
0ed25becd0 Add safezone handling for insets and display cutout
#ue4
#android
[FYI] Jack.Porter
#rb Thomas.Ross


#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 6187820 via CL 6187823 via CL 6188559 via CL 6188565
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6227498 by chris babcock in Dev-Anim branch]
2019-05-01 19:39:10 -04:00
jack porter
bbb7ceda89 Fix for Android crash when playing streaming media
#rb Jack.Porter

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 6167581 via CL 6167589 via CL 6168458 via CL 6178432
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6214968 by jack porter in Dev-Anim branch]
2019-05-01 18:33:53 -04:00
pete procopio
afaf08b01a FORT-169125: Update google firebase json files so we can use different ones in prod, stage and dev
#rb:Chris.Babcock
#jira:FORT-169125
#kairos
#android

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: pete.procopio
#ROBOMERGE-SOURCE: CL 6111340 via CL 6111356 via CL 6112810 via CL 6112982
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6130484 by pete procopio in Dev-Anim branch]
2019-04-26 22:34:27 -04:00
sorin gradinaru
2532c62bf1 FORT-167965 Android crashing when trying to Replay Cinematic using IBM streaming
#9.00
#Android
#rb Chris.Babcock

Adding VideoDecoder$FrameUpdateInfo to proguard exceptions

(from 8.50 CL6053281)

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: sorin.gradinaru
#ROBOMERGE-SOURCE: CL 6078719 via CL 6078889 via CL 6085197 via CL 6085400
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6115442 by sorin gradinaru in Dev-Anim branch]
2019-04-26 21:00:42 -04:00
chris babcock
de5c9d84cc Only keep Profile override from ConifgRules if OverrideProfile left set
#android
[FYI] Jack.Porter
#rb trivial


#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 5923214 via CL 5923242 via CL 5932554 via CL 5932753
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5940613 by chris babcock in Dev-Anim branch]
2019-04-17 13:18:36 -04:00
michael kirzinger
2c28693b47 Add JNI for routing service intent to native code
#android
[CODEREVIEW] [at]chris.babcock

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: michael.kirzinger
#ROBOMERGE-SOURCE: CL 5836494 via CL 5837931 via CL 5838912 via CL 5838942
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5881042 by michael kirzinger in Dev-Anim branch]
2019-04-12 21:34:26 -04:00
jack porter
b135e94e55 Merging CL 5808949 - support streaming live video on Android
#rb Jack.Porter, Andriy.Tylychko

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 5809911 via CL 5809928 via CL 5810360 via CL 5813341 via CL 5813464
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5843255 by jack porter in Dev-Anim branch]
2019-04-12 13:02:48 -04:00
chris babcock
a7b76c6866 Allow actions to be inserted whenever software keyboard opened or closed on Android
#ue4
#android
#rb none


#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 5715224 via CL 5715228 via CL 5715231 via CL 5715237 via CL 5717587 via CL 5717686
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5727689 by chris babcock in Dev-Anim branch]
2019-04-04 01:04:10 -04:00
chris babcock
74e7aaf922 Allow forwarding back button to Java on Android
#ue4
#android
#rb Guilherme.Iscaro


#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 5691593 via CL 5691602 via CL 5691603 via CL 5691604 via CL 5695670 via CL 5695735
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5701424 by chris babcock in Dev-Anim branch]
2019-04-02 21:12:02 -04:00
chris babcock
ec7f898d39 Add gameActivityAfterMainViewCreatedAdditions to GameActivity.java.template
#android
[FYI] Peter.Procopio
#rb none


#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 5677353 via CL 5677355 via CL 5677357 via CL 5677359 via CL 5677910 via CL 5677916
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5682630 by chris babcock in Dev-Anim branch]
2019-04-02 01:05:07 -04:00
chris babcock
d49a587914 Allow fullscreen on S10
#android

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 5406350 via CL 5406367 via CL 5406373 via CL 5406378 via CL 5406990 via CL 5407017
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5412101 by chris babcock in Dev-Anim branch]
2019-03-15 06:08:59 -04:00
chris babcock
ab9494aae9 Fix intent extra data passing to be consistent between SplashActivity and GameActivity
#ue4
#android


#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 5369383 via CL 5372306 via CL 5377280
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5382049 by chris babcock in Dev-Anim branch]
2019-03-13 10:08:54 -04:00
chris babcock
1bf64ae22c Ask for external storage permission in SplashActivity instead of GameActivity
#jira UE-71231
#ue4
#android
#rb Jack.Porter

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 5365436 in //UE4/Release-4.22/... via CL 5368989
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5381942 by chris babcock in Dev-Anim branch]
2019-03-13 10:04:31 -04:00
lina halper
e178dc3a39 Merging 5360223 from Dev-EngineMerge. DevK integration.
#rb #jira na

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 5361784 in //UE4/Main/...
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5380699 by lina halper in Dev-Anim branch]
2019-03-13 09:34:35 -04:00
Thomas Sarkanen
bb193db1aa Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 5356908
#rb none

[CL 5360337 by Thomas Sarkanen in Dev-Anim branch]
2019-03-11 12:18:32 -04:00
chris babcock
42b75b3235 Enable intercepting Java side logcat on Android
#ue4
#android
[FYI] Jack.Porter


#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 5308536 via CL 5308541 via CL 5310067 via CL 5310183
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5327333 by chris babcock in Dev-Anim branch]
2019-03-06 18:24:10 -05:00