Commit Graph

203 Commits

Author SHA1 Message Date
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
chris babcock
a7732cf13c Better chipset identification checking in ConfigRules (ignore case)
#android
[FYI] Jack.Porter


#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 5296094 via CL 5296096 via CL 5306646 via CL 5306743
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5322688 by chris babcock in Dev-Anim branch]
2019-03-06 18:04:23 -05:00
chris babcock
3338de0084 More fallout of merge in GameActivity
- added GameApplication, network change notifications, Firebase, and lifecycle

#android
#rb Pete.Procopio


#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 5232162 via CL 5238945 via CL 5239022
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5246372 by chris babcock in Dev-Anim branch]
2019-02-28 17:16:00 -05:00
Thomas Sarkanen
474bc576ee Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 5236305
#rb none
#jira none

[CL 5236785 by Thomas Sarkanen in Dev-Anim branch]
2019-02-28 04:41:36 -05:00
chris babcock
d170fd8e3c Skip track info extraction if startup movie on Android
#jira UE-70101
#ue4
#android
#rb Peter.Sauerbrei

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

[CL 5144808 by chris babcock in Dev-Anim branch]
2019-02-22 11:28:49 -05:00
Thomas Sarkanen
fdcba8f624 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4822026
#rb none
#jira none

[CL 4822205 by Thomas Sarkanen in Dev-Anim branch]
2019-01-28 05:55:22 -05:00
Marc Audy
e5610adfd8 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ 4802313
#rb
#rnx
#lockdown Laurent.Delayen

[CL 4803512 by Marc Audy in Dev-Anim branch]
2019-01-24 15:32:49 -05:00
Thomas Sarkanen
cc942a3341 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4768627
#rb none
#jira none

[CL 4769629 by Thomas Sarkanen in Dev-Anim branch]
2019-01-22 06:48:04 -05:00
Thomas Sarkanen
e0f6136524 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4704791
#rb none
#jiira none

[CL 4708070 by Thomas Sarkanen in Dev-Anim branch]
2019-01-11 04:11:30 -05:00
Thomas Sarkanen
7088a2f273 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4683693
#rb none
#jira none

[CL 4684302 by Thomas Sarkanen in Dev-Anim branch]
2019-01-07 05:38:46 -05:00
Thomas Sarkanen
8ba3c4c087 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
#rb none
#jira none

[CL 4665410 by Thomas Sarkanen in Dev-Anim branch]
2018-12-17 06:31:16 -05:00
Thomas Sarkanen
c51a339259 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4574801
#jira none
#rb none

[CL 4575789 by Thomas Sarkanen in Dev-Anim branch]
2018-11-19 07:03:18 -05:00