From 92a37fb266e6c2f0e7d77416e92a2fa81842ed87 Mon Sep 17 00:00:00 2001 From: The Judge Date: Mon, 16 Sep 2024 20:15:30 -0700 Subject: [PATCH] Merge issues --- src/main/java/pojlib/UnityPlayerActivity.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/pojlib/UnityPlayerActivity.java b/src/main/java/pojlib/UnityPlayerActivity.java index 53e220a0..696d45ea 100644 --- a/src/main/java/pojlib/UnityPlayerActivity.java +++ b/src/main/java/pojlib/UnityPlayerActivity.java @@ -1,13 +1,11 @@ package pojlib; import static android.os.Build.VERSION.SDK_INT; - import static org.lwjgl.glfw.CallbackBridge.sendKeyPress; import static org.lwjgl.glfw.CallbackBridge.sendMouseButton; import android.annotation.SuppressLint; import android.app.Activity; -import android.app.Activity; import android.app.ActivityGroup; import android.content.ClipData; import android.content.ClipboardManager; @@ -41,11 +39,16 @@ import pojlib.input.gamepad.Gamepad; import pojlib.util.Constants; import pojlib.util.FileUtil; -import pojlib.util.Logger; public class UnityPlayerActivity extends ActivityGroup implements IUnityPlayerLifecycleEvents, GrabListener { protected UnityPlayer mUnityPlayer; // don't change the name of this variable; referenced from native code + public static volatile ClipboardManager GLOBAL_CLIPBOARD; + private Gamepad mGamepad = null; + + private RemapperManager mInputManager; + + private boolean mLastGrabState = false; // Override this in your custom UnityPlayerActivity to tweak the command line arguments passed to the Unity Android Player // The command line arguments are passed as a string, separated by spaces @@ -364,7 +367,6 @@ public boolean onKeyMultiple(int keyCode, int repeatCount, KeyEvent event) { @Override protected void onDestroy () { mUnityPlayer.destroy(); - wakeLock.release(); super.onDestroy(); }