From a575857724e3e2c4e695a0ffa5ef4e15e7b9ac68 Mon Sep 17 00:00:00 2001 From: chris babcock Date: Mon, 1 Apr 2019 20:59:30 -0400 Subject: [PATCH] Add gameActivityAfterMainViewCreatedAdditions to GameActivity.java.template #android [FYI] Peter.Procopio #rb none #ROBOMERGE-SOURCE: CL 5677353 via CL 5677355 via CL 5677357 via CL 5677359 via CL 5677910 [CL 5677916 by chris babcock in Main branch] --- .../Java/src/com/epicgames/ue4/GameActivity.java.template | 2 ++ .../UnrealBuildTool/Platform/Android/UEDeployAndroid.cs | 1 + 2 files changed, 3 insertions(+) diff --git a/Engine/Build/Android/Java/src/com/epicgames/ue4/GameActivity.java.template b/Engine/Build/Android/Java/src/com/epicgames/ue4/GameActivity.java.template index 640836164641..5e22ac794284 100644 --- a/Engine/Build/Android/Java/src/com/epicgames/ue4/GameActivity.java.template +++ b/Engine/Build/Android/Java/src/com/epicgames/ue4/GameActivity.java.template @@ -2866,6 +2866,8 @@ public class GameActivity extends $${gameActivitySuperClass}$$ implements Surfac } }); +//$${gameActivityAfterMainViewCreatedAdditions}$$ + clipboardManager = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE); //$${gameActivityOnCreateAdditions}$$ diff --git a/Engine/Source/Programs/UnrealBuildTool/Platform/Android/UEDeployAndroid.cs b/Engine/Source/Programs/UnrealBuildTool/Platform/Android/UEDeployAndroid.cs index 1114ac693393..ef942cd4ad03 100644 --- a/Engine/Source/Programs/UnrealBuildTool/Platform/Android/UEDeployAndroid.cs +++ b/Engine/Source/Programs/UnrealBuildTool/Platform/Android/UEDeployAndroid.cs @@ -4283,6 +4283,7 @@ namespace UnrealBuildTool { "//$${gameActivityPostConfigRulesAdditions}$$", UPL.ProcessPluginNode(NDKArch, "gameActivityPostConfigRulesAdditions", "")}, { "//$${gameActivityFinalizeConfigRulesAdditions}$$", UPL.ProcessPluginNode(NDKArch, "gameActivityFinalizeConfigRulesAdditions", "")}, { "//$${gameActivityBeforeConfigRulesAppliedAdditions}$$", UPL.ProcessPluginNode(NDKArch, "gameActivityBeforeConfigRulesAppliedAdditions", "")}, + { "//$${gameActivityAfterMainViewCreatedAdditions}$$", UPL.ProcessPluginNode(NDKArch, "gameActivityAfterMainViewCreatedAdditions", "")}, { "//$${gameActivityLoggerCallbackAdditions}$$", UPL.ProcessPluginNode(NDKArch, "gameActivityLoggerCallbackAdditions", "")}, { "//$${soLoadLibrary}$$", UPL.ProcessPluginNode(NDKArch, "soLoadLibrary", LoadLibraryDefaults)}, { "$${gameActivitySuperClass}$$", SuperClassDefault},