SPenActions: Add support for batched motion packets

Seen in newer firmware versions of the S Pen.

Co-authored-by: programminghoch10 <hoch10@kabelbw.de>
Change-Id: Ic4400ae262dbae3bfb2f3511e3157df099d0f3c2

Author: bgcngm

packages/SPenActions/src/org/lineageos/spenactions/MotionEvent.java

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2022 The LineageOS Project
+ * SPDX-FileCopyrightText: 2021-2026 The LineageOS Project
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -37,13 +37,18 @@ public short getDY() {
         return mDy;
     }
 
-    public static MotionEvent fromTypeData(int type, byte[] data) {
+    public static MotionEvent fromData(byte[] data, int offset) {
+        if (data == null || data.length < offset + 5) {
+            return null;
+        }
+
+        int type = data[offset] & 0xFF;
         if (type != 0x0F) {
             return null;
         }
 
-        short dx = extractShortValue(data, 1);
-        short dy = extractShortValue(data, 3);
+        short dx = extractShortValue(data, offset + 1);
+        short dy = extractShortValue(data, offset + 3);
 
         return new MotionEvent(Action.MOVE, dx, dy);
     }

packages/SPenActions/src/org/lineageos/spenactions/SPenGattCallback.java

@@ -139,35 +139,56 @@ private void setCharacteristicNotification(BluetoothGatt gatt,
     }
 
     private void handleButtonEvent(byte[] data) {
+        if (data == null || data.length == 0) {
+            return;
+        }
+
         int type = data[0] & 0xFF;
 
         if (DEBUG) Log.d(LOG_TAG, "BUTTON_EVENT raw: len=" + data.length +
                 " data=" + Arrays.toString(data));
 
-        ButtonAction button = ButtonAction.fromType(type);
-        if (button != null) {
-            switch (button.getAction()) {
-                case DOWN:
-                    mButtonDownTime = SystemClock.uptimeMillis();
-                    break;
-                case UP:
-                    if (!mButtonHadGesture) {
-                        SPenMode mode = SPenMode.valueOfPref(SettingsUtils.getSwitchPreference(
-                                mContext, SettingsUtils.SPEN_MODE, "0"));
-                        // Can be used for e.g taking photos
-                        sendEvent(mButtonDownTime, KeyEvent.ACTION_DOWN, mode.getButtonKey());
-                        sendEvent(KeyEvent.ACTION_UP, mode.getButtonKey());
-                    }
-                    mButtonHadGesture = false;
-                    break;
-                default:
-                    break;
+        // Batched packets (newer firmware)
+        if (type == 0xF0 && data.length >= 8) {
+            // Motion records start at offset 2
+            for (int i = 2; i + 5 < data.length; i += 6) {
+                MotionEvent move = MotionEvent.fromData(data, i);
+                handleGesture(move);
             }
             return;
         }
 
-        MotionEvent move = MotionEvent.fromTypeData(type, data);
-        handleGesture(move);
+        // Legacy motion handling (for old firmware)
+        if (type == 0x0F && data.length >= 5) {
+            MotionEvent move = MotionEvent.fromData(data, 0);
+            handleGesture(move);
+            return;
+        }
+
+        // Button events (single-byte packets)
+        ButtonAction button = ButtonAction.fromType(type);
+        if (button == null) {
+            Log.w(LOG_TAG, "Unknown BUTTON_EVENT type: " + type);
+            return;
+        }
+
+        switch (button.getAction()) {
+            case DOWN:
+                mButtonDownTime = SystemClock.uptimeMillis();
+                break;
+            case UP:
+                if (!mButtonHadGesture) {
+                    SPenMode mode = SPenMode.valueOfPref(SettingsUtils.getSwitchPreference(
+                            mContext, SettingsUtils.SPEN_MODE, "0"));
+                    // Can be used for e.g taking photos
+                    sendEvent(mButtonDownTime, KeyEvent.ACTION_DOWN, mode.getButtonKey());
+                    sendEvent(KeyEvent.ACTION_UP, mode.getButtonKey());
+                }
+                mButtonHadGesture = false;
+                break;
+            default:
+                break;
+        }
     }
 
     private void handleGesture(MotionEvent move) {