From c06757101fc1dfc60d1713ea9becc225fcebf1df Mon Sep 17 00:00:00 2001
From: Hugh Sanderson <hugh@hughsando.com>
Date: Thu, 5 Sep 2024 23:29:32 +0800
Subject: [PATCH] Add build note.  Try sending gamepad keys from view.

---
 README.md                                             | 6 ++++++
 src/nme/android/Bluetooth.hx                          | 2 +-
 templates/android/java/org/haxe/nme/GameActivity.java | 2 +-
 templates/android/java/org/haxe/nme/MainView.java     | 4 ++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8b7d845e6..f9b59e575 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,12 @@ haxelib install nme
 haxelib run nme setup
 ```
 
+To run with `NME_LOCAL_TOOLKIT` (the default for android now), update the submodules with:
+```
+git submodule init
+git submodule update
+```
+
 To install a specific version
 
 1. Go to [the releases page](https://github.com/haxenme/nme/releases)
diff --git a/src/nme/android/Bluetooth.hx b/src/nme/android/Bluetooth.hx
index 3488174e0..a3aaf6b0e 100644
--- a/src/nme/android/Bluetooth.hx
+++ b/src/nme/android/Bluetooth.hx
@@ -43,7 +43,7 @@ class Bluetooth
    public function new(inPortName:String, ?baud:Int = 9600, ?setupImmediately:Bool = false)
    {
       portName = inPortName;
-      baud = 57600;
+      //baud = 57600;
 
       handle = create(inPortName);
 
diff --git a/templates/android/java/org/haxe/nme/GameActivity.java b/templates/android/java/org/haxe/nme/GameActivity.java
index c73c7050d..11c23872b 100644
--- a/templates/android/java/org/haxe/nme/GameActivity.java
+++ b/templates/android/java/org/haxe/nme/GameActivity.java
@@ -171,7 +171,7 @@ class NmeText extends EditText
    public boolean  mTextUpdateLockout = false;
    public boolean  mIncrementalText = true;
    boolean ignoreTextReset = false;
-   static boolean consumeGamepadButtons = false;
+   public static boolean consumeGamepadButtons = false;
 
    public void onCreate(Bundle state)
    {
diff --git a/templates/android/java/org/haxe/nme/MainView.java b/templates/android/java/org/haxe/nme/MainView.java
index 1b7f8281e..0ff546366 100644
--- a/templates/android/java/org/haxe/nme/MainView.java
+++ b/templates/android/java/org/haxe/nme/MainView.java
@@ -595,6 +595,8 @@ public void run() {
                  }});
              return true;
          }
+         if (sendGamepadKey(inKeyCode,event) && GameActivity.consumeGamepadButtons)
+            return true;
          return super.onKeyDown(inKeyCode, event);
      }
 
@@ -618,6 +620,8 @@ public void run() {
                  }});
              return true;
          }
+         if (sendGamepadKey(inKeyCode,event) && GameActivity.consumeGamepadButtons)
+            return true;
          return super.onKeyDown(inKeyCode, event);
      }