Merge pull request #1951 from keymapperorg/develop

4.0.0 Beta 4

Author: sds100

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -60,6 +60,15 @@ body:
     validations:
       required: true
 
+  - type: input
+    id: android_version
+    attributes:
+      label: Android version
+      description: Go to your Settings app and find your _Android_ version. NOT the HyperOS, MIUI, OxygenOS, OneUI version.
+      placeholder: Android 15
+    validations:
+      required: true
+
   - type: input
     id: device
     attributes:

.github/workflows/pull-request.yml

@@ -17,9 +17,6 @@ jobs:
           java-version: 17
           cache: 'gradle'
 
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
-
       - name: Unit tests
         run: bash ./gradlew testDebugUnitTest
 
@@ -46,12 +43,48 @@ jobs:
           java-version: 17
           cache: 'gradle'
 
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
-
       - name: Ktlint check
         run: ./gradlew ktlintCheck
 
+  rust:
+    name: Rust code style and tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt, clippy
+
+      - name: Install Android Rust targets
+        run: |
+          rustup target add armv7-linux-androideabi
+          rustup target add aarch64-linux-android
+          rustup target add i686-linux-android
+          rustup target add x86_64-linux-android
+
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            evdev/src/main/rust/evdev_manager/target/
+          key: ${{ runner.os }}-rust-${{ hashFiles('**/Cargo.toml', '**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-rust-
+
+      - name: Check Rust formatting
+        working-directory: evdev/src/main/rust/evdev_manager
+        run: cargo fmt --check
+
+      - name: Run Rust tests
+        working-directory: evdev/src/main/rust/evdev_manager
+        run: cargo test --package evdev_manager_core
+
   apk:
     name: Build APK
     runs-on: ubuntu-latest
@@ -77,6 +110,18 @@ jobs:
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
+        with:
+          ndk-version: "27.2.12479018"
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Install Android Rust targets
+        run: |
+          rustup target add armv7-linux-androideabi
+          rustup target add aarch64-linux-android
+          rustup target add i686-linux-android
+          rustup target add x86_64-linux-android
 
       - name: set up Ruby for fastlane
         uses: ruby/setup-ruby@v1

.github/workflows/testing.yml

@@ -23,9 +23,6 @@ jobs:
           java-version: 17
           cache: 'gradle'
 
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
-
       - name: Unit tests
         run: bash ./gradlew testDebugUnitTest
 
@@ -52,14 +49,50 @@ jobs:
           java-version: 17
           cache: 'gradle'
 
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
-
       - name: Ktlint check
         run: ./gradlew ktlintCheck
 
+  rust:
+    name: Rust code style and tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt, clippy
+
+      - name: Install Android Rust targets
+        run: |
+          rustup target add armv7-linux-androideabi
+          rustup target add aarch64-linux-android
+          rustup target add i686-linux-android
+          rustup target add x86_64-linux-android
+
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            evdev/src/main/rust/evdev_manager/target/
+          key: ${{ runner.os }}-rust-${{ hashFiles('**/Cargo.toml', '**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-rust-
+
+      - name: Check Rust formatting
+        working-directory: evdev/src/main/rust/evdev_manager
+        run: cargo fmt --check
+
+      - name: Run Rust tests
+        working-directory: evdev/src/main/rust/evdev_manager
+        run: cargo test --package evdev_manager_core
+
   apk:
-    name: Generate and upload APK to Discord
+    name: Build APK
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -89,6 +122,18 @@ jobs:
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
+        with:
+          ndk-version: "27.2.12479018"
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Install Android Rust targets
+        run: |
+          rustup target add armv7-linux-androideabi
+          rustup target add aarch64-linux-android
+          rustup target add i686-linux-android
+          rustup target add x86_64-linux-android
 
       - name: set up Ruby for fastlane
         uses: ruby/setup-ruby@v1
@@ -122,21 +167,6 @@ jobs:
           name: ${{ env.APK_NAME }}
           path: app/build/outputs/apk/ci/${{ env.APK_NAME }}.apk
 
-      - name: Upload to Discord
-        uses: sinshutu/upload-to-discord@v2.0.0
-        if: github.event.repository.fork == false
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        with:
-          args: app/build/outputs/apk/ci/${{ env.APK_NAME }}.apk
-
-      - name: Report build status to Discord
-        uses: sarisia/actions-status-discord@v1
-        if: github.event.repository.fork == false && failure()
-        with:
-          title: "Build apk"
-          webhook: ${{ secrets.DISCORD_BUILD_STATUS_WEBHOOK }}
-
   synchronize-with-crowdin:
     runs-on: ubuntu-latest
 

.gitignore

@@ -94,3 +94,7 @@ app/.env
 /.idea/AndroidProjectSystem.xml
 /.idea/runConfigurations.xml
 /.idea/studiobot.xml
+
+evdev/build
+evdev/.cxx
+evdev/src/main/rust/*/target

CHANGELOG.md

@@ -1,32 +1,65 @@
+## [4.0.0 Beta 4](https://github.com/sds100/KeyMapper/releases/tag/v4.0.0-beta.04)
+
+#### 25 December 2025
+
+Merry Christmas from the Key Mapper team! 🎄
+
+Renamed PRO mode to Expert mode because it sounded like a paid premium feature even though it is free.
+
+## Added
+
+- #1915 ask user to remove "adb shell" from Shell command.
+- #1904 inform the user how to enable the accessibility service with PRO mode or ADB.
+- #1911 constraint for physical device orientation that ignores auto rotate setting.
+- #1918 improve how key event actions are performed with system bridge.
+- #1905 system bridge log is now visible in Key Mapper log.
+- #1941 show loading indicator when starting system bridge.
+
+## Bug fixes
+
+- #1913 actually save the option to detect with scan code
+- #1931 fix Close and Remove From Recents action on some Android 13 revisions
+- #1926 PRO mode triggers for external devices work when the device reconnects.
+- #1918 PRO mode key maps can input key codes that aren't originally supported by the trigger
+  device.
+- #1934 hold down option for Tap Screen action is added back.
+- Log less verbose.
+
 ## [4.0.0 Beta 3](https://github.com/sds100/KeyMapper/releases/tag/v4.0.0-beta.03)
 
 #### 25 November 2025
 
 ## Added
+
 - #1871 action to modify any system settings.
 - #1221 action to show a custom notification.
 - #1491 action to toggle/enable/disable hotspot.
 - #1414 constraint for when the keyboard is showing.
 - #1900 log to logcat if extra logging is enabled.
 - #1902 add toggle next to record trigger button to use PRO mode.
+- #1909 categorise constraints similar to actions.
 
 ## Bug fixes
 
 - #1901 prompt user to set default USB configuration to 'No data transfer' after starting pro mode.
-- #1898 do not launch directly into the Wireless Debugging activity on Xiaomi devices due to a bug they introduced.
+- #1898 do not launch directly into the Wireless Debugging activity on Xiaomi devices due to a bug
+  they introduced.
 
 ## [4.0.0 Beta 2](https://github.com/sds100/KeyMapper/releases/tag/v4.0.0-beta.02)
 
 #### 08 November 2025
 
 ## Added
 
-- #1890 add button to save log to file and share it. The clipboard button now cuts off older entries and keeps newest ones.
+- #1890 add button to save log to file and share it. The clipboard button now cuts off older entries
+  and keeps newest ones.
 
 ## Fixed
 
-- Only autostart PRO mode with Shizuku if Shizuku permission is granted. Otherwise fallback to method with Wireless Debugging and WRITE_SECURE_SETTINGS permission.
-- Starting system bridge for the first time would be janky because granting READ_LOGS kills the app process. Only grant for READ_LOGS when sharing logcat from settings.
+- Only autostart PRO mode with Shizuku if Shizuku permission is granted. Otherwise fallback to
+  method with Wireless Debugging and WRITE_SECURE_SETTINGS permission.
+- Starting system bridge for the first time would be janky because granting READ_LOGS kills the app
+  process. Only grant for READ_LOGS when sharing logcat from settings.
 - #1886 mobile data actions work in PRO mode.
 
 ## [4.0.0 Beta 1](https://github.com/sds100/KeyMapper/releases/tag/v4.0.0-beta.01)

README.md

@@ -12,7 +12,7 @@
 <a href='https://play.google.com/store/apps/details?id=io.github.sds100.keymapper&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png' height='75px'/></a>
 <a href="https://f-droid.org/packages/io.github.sds100.keymapper/" rel="nofollow"><img alt="Get it on F-Droid" height="75" src="https://user-images.githubusercontent.com/53379023/142497343-0e635fc5-056b-46ff-8d8e-d607ed95527e.png" data-canonical-src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" style="max-width: 100%;"></a>
   </br>
-<a href='https://ko-fi.com/M4M41032E' target='_blank'><img height='30' style='border:0px;height:30x;' src='https://cdn.ko-fi.com/cdn/kofi1.png?v=2' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a>
+<a href='https://ko-fi.com/M4M41032E' target='_blank'><img height='30' style='border:0px;' src='https://cdn.ko-fi.com/cdn/kofi1.png?v=2' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a>
 <noscript><a href="https://liberapay.com/sds100/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg"></a></noscript>
 <noscript><a href="https://buy.stripe.com/00g16L9YEabldDWdQQ"><img alt="Donate using Stripe" src="https://img.shields.io/badge/Donate-Stripe-blueviolet?style=for-the-badge&logo=stripe"></a></noscript>
 </p>

app/build.gradle.kts

@@ -152,6 +152,7 @@ dependencies {
     implementation(project(":data"))
     implementation(project(":sysbridge"))
     implementation(project(":system"))
+    implementation(project(":evdev"))
     compileOnly(project(":systemstubs"))
 
     coreLibraryDesugaring(libs.desugar.jdk.libs)

app/proguard-rules.pro

@@ -116,7 +116,7 @@
 
 # Keep all AIDL interface classes and their methods
 -keep class io.github.sds100.keymapper.sysbridge.ISystemBridge** { *; }
--keep class io.github.sds100.keymapper.sysbridge.IEvdevCallback** { *; }
+-keep class io.github.sds100.keymapper.evdev.IEvdevCallback** { *; }
 -keep class io.github.sds100.keymapper.sysbridge.IShizukuStarterService** { *; }
 
 -keepclassmembers class io.github.sds100.keymapper.sysbridge.shizuku.ShizukuStarterService {
@@ -138,7 +138,10 @@
 -keep class io.github.sds100.keymapper.sysbridge.** extends android.content.ContentProvider { *; }
 
 # Keep parcelable classes used in AIDL
--keep class io.github.sds100.keymapper.common.models.EvdevDeviceHandle { *; }
+-keep class io.github.sds100.keymapper.common.models.GrabbedDeviceHandle { *; }
+-keep class io.github.sds100.keymapper.common.models.EvdevDeviceInfo { *; }
+-keep class io.github.sds100.keymapper.common.models.GrabTargetKeyCode { *; }
+-keep class io.github.sds100.keymapper.common.models.ShellResult { *; }
 
 # Keep all rikka.hidden classes and interfaces as they contain AIDL files
 -keep class rikka.hidden.** { *; }
@@ -241,4 +244,4 @@
 -dontwarn android.view.DisplayInfo
 -dontwarn android.view.IWindowManager**
 -dontwarn com.android.internal.app.**
--dontwarn com.android.internal.policy.**
+-dontwarn com.android.internal.policy.**

app/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
     <!--  This is required because sysbridge has a min sdk of 29 since it depends
       on the binder-ndk library. Building will fail without this because the min sdk
       of the app is 26.-->
-    <uses-sdk tools:overrideLibrary="io.github.sds100.keymapper.sysbridge" />
+    <uses-sdk tools:overrideLibrary="io.github.sds100.keymapper.sysbridge, io.github.sds100.keymapper.evdev" />
 
     <application
         android:name="io.github.sds100.keymapper.KeyMapperApp"

app/src/main/java/io/github/sds100/keymapper/system/accessibility/AccessibilityServiceController.kt

@@ -6,10 +6,10 @@ import dagger.assisted.AssistedInject
 import io.github.sds100.keymapper.base.actions.PerformActionsUseCaseImpl
 import io.github.sds100.keymapper.base.constraints.DetectConstraintsUseCaseImpl
 import io.github.sds100.keymapper.base.detection.DetectKeyMapsUseCaseImpl
+import io.github.sds100.keymapper.base.expertmode.SystemBridgeSetupAssistantController
 import io.github.sds100.keymapper.base.input.InputEventHub
 import io.github.sds100.keymapper.base.keymaps.FingerprintGesturesSupportedUseCase
 import io.github.sds100.keymapper.base.keymaps.PauseKeyMapsUseCase
-import io.github.sds100.keymapper.base.promode.SystemBridgeSetupAssistantController
 import io.github.sds100.keymapper.base.system.accessibility.AccessibilityNodeRecorder
 import io.github.sds100.keymapper.base.system.accessibility.BaseAccessibilityServiceController
 import io.github.sds100.keymapper.base.system.inputmethod.AutoSwitchImeController