#1394 PRO mode

CHANGELOG.md

@@ -1,3 +1,28 @@
+## [4.0.0 Beta 1](https://github.com/sds100/KeyMapper/releases/tag/v4.0.0-beta.01)
+
+#### TO BE RELEASED
+
+## Added
+
+- #761 Detect keys with scancodes. Key Mapper will do this automatically if the key code is unknown
+  or you record different physical keys from the same device with the same key code.
+- Redesign the Settings screen
+
+## Removed
+
+- The key event relay service is now also used on all Android versions below Android 14. The
+  broadcast receiver method is no longer used.
+- Minimum supported Android version is now 8.0. Less than 1% of users are on older versions than
+  this and dropping support simplifies the codebase and maintenance.
+- Dropped support for showing a keyboard picker notification and automatically showing it when a
+  device connects. This is only supported on Android 8.1 and is extra work to maintain it.
+- Dropped support for rerouting key events on Android 11. This was a workaround for a specific bug
+  in Android 11 which fewer than 10% of users are using and less are probably using that feature.
+
+## Fixed
+
+- Restoring subgroups works and does not freeze Key Mapper
+
 ## [3.2.1](https://github.com/sds100/KeyMapper/releases/tag/v3.2.1)
 
 #### 03 Sept 2025

CREDITS.md

@@ -13,6 +13,8 @@ Many thanks to...
  - @[MFlisar](https://github.com/MFlisar) for their [drag and select](https://github.com/MFlisar/DragSelectRecyclerView) library.
  - @[RikkaApps](https://github.com/RikkaApps) for Shizuku! It is amazing.
  - @[canopas](https://github.com/canopas) for their Jetpack Compose Tap Target library https://github.com/canopas/compose-intro-showcase.
+- @[topjohnwu](https://github.com/topjohnwu) for Magisk
+  and [libsu](https://github.com/topjohnwu/libsu).
 
 [salomonbrys]: https://github.com/salomonbrys
 [Kotson]: https://github.com/salomonbrys/Kotson

api/src/main/java/io/github/sds100/keymapper/api/KeyEventRelayService.kt

@@ -21,7 +21,10 @@ import java.util.concurrent.ConcurrentHashMap
  *
  * This was originally implemented in issue #850 for the action to answer phone calls
  * because Android doesn't pass volume down key events to the accessibility service
- * when the phone is ringing or it is in a phone call.
+ * when the phone is ringing or it is in a phone call. Later, in Android 14 this relay must be
+ * used because they also introduced a 1-second delay to context-registered broadcast receivers.
+ * And who knows what other restrictions will be added in the future :)
+ *
  * The accessibility service registers a callback and the input method service
  * sends the key events.
  */

app/build.gradle.kts

@@ -141,6 +141,7 @@ dependencies {
     implementation(project(":base"))
     implementation(project(":api"))
     implementation(project(":data"))
+    implementation(project(":sysbridge"))
     implementation(project(":system"))
     compileOnly(project(":systemstubs"))
 

app/proguard-rules.pro

@@ -98,4 +98,136 @@
 
 -keep class com.google.gson.reflect.TypeToken
 -keep class * extends com.google.gson.reflect.TypeToken
--keep public class * implements java.lang.reflect.Type
+-keep public class * implements java.lang.reflect.Type
+
+-keep class io.github.sds100.keymapper.sysbridge.service.SystemBridge {
+    public <methods>;
+    native <methods>;
+    static <methods>;
+    <init>(...);
+}
+
+# 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.sysbridge.IShizukuStarterService** { *; }
+
+# Keep binder provider classes
+-keep class io.github.sds100.keymapper.sysbridge.provider.** { *; }
+
+# Keep classes accessed via reflection or from system services
+-keep class io.github.sds100.keymapper.sysbridge.utils.** { *; }
+
+# Keep native method signatures
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+# Keep classes that might be accessed via ContentProvider
+-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 all rikka.hidden classes and interfaces as they contain AIDL files
+-keep class rikka.hidden.** { *; }
+-keep interface rikka.hidden.** { *; }
+
+# Keep Android system API classes and interfaces that rikka.hidden depends on
+# android.app package classes
+-keep class android.app.ActivityManagerNative { *; }
+-keep class android.app.ActivityTaskManager$RootTaskInfo { *; }
+-keep class android.app.ContentProviderHolder { *; }
+-keep class android.app.IActivityManager** { *; }
+-keep class android.app.IApplicationThread** { *; }
+-keep class android.app.IProcessObserver** { *; }
+-keep class android.app.ITaskStackListener** { *; }
+-keep class android.app.IUidObserver** { *; }
+-keep class android.app.ProfilerInfo { *; }
+
+# android.content package classes
+-keep class android.content.IContentProvider** { *; }
+-keep class android.content.IIntentReceiver** { *; }
+
+# android.content.pm package classes
+-keep class android.content.pm.IPackageManager** { *; }
+-keep class android.content.pm.IPackageInstaller** { *; }
+-keep class android.content.pm.ILauncherApps** { *; }
+-keep class android.content.pm.IOnAppsChangedListener** { *; }
+-keep class android.content.pm.IPackageInstallerCallback** { *; }
+-keep class android.content.pm.ParceledListSlice { *; }
+-keep class android.content.pm.UserInfo { *; }
+
+# android.hardware package classes
+-keep class android.hardware.input.IInputManager** { *; }
+-keep class android.hardware.display.IDisplayManager** { *; }
+-keep class android.hardware.display.IDisplayManagerCallback** { *; }
+
+# android.os package classes
+-keep class android.os.BatteryProperty { *; }
+-keep class android.os.IBatteryPropertiesRegistrar** { *; }
+-keep class android.os.IDeviceIdleController { *; }
+-keep class android.os.IDeviceIdleController** { *; }
+-keep class android.os.IUserManager { *; }
+-keep class android.os.IUserManager** { *; }
+-keep class android.os.RemoteCallback** { *; }
+-keep class android.os.ServiceManager { *; }
+
+# android.view package classes
+-keep class android.view.DisplayInfo { *; }
+-keep class android.view.IWindowManager** { *; }
+
+# android.permission package classes
+-keep class android.permission.IPermissionManager** { *; }
+
+# android.net package classes
+-keep class android.net.wifi.IWifiManager** { *; }
+
+# com.android.internal package classes
+-keep class com.android.internal.app.IAppOpsActiveCallback** { *; }
+-keep class com.android.internal.app.IAppOpsNotedCallback** { *; }
+-keep class com.android.internal.app.IAppOpsService** { *; }
+-keep class com.android.internal.policy.IKeyguardLockedStateListener** { *; }
+
+# Keep all Android AIDL interfaces (they implement IInterface)
+-keep class android.** implements android.os.IInterface { *; }
+
+# Keep Android system service stubs and natives
+-keep class android.**Native { *; }
+-keep class android.**$Stub** { *; }
+-keep class android.**$Proxy** { *; }
+
+# Keep Android hidden/internal classes that might be accessed via reflection
+-dontwarn android.app.ActivityManagerNative
+-dontwarn android.app.ActivityTaskManager$**
+-dontwarn android.app.ContentProviderHolder
+-dontwarn android.app.IActivityManager**
+-dontwarn android.app.IApplicationThread**
+-dontwarn android.app.IProcessObserver**
+-dontwarn android.app.ITaskStackListener**
+-dontwarn android.app.IUidObserver**
+-dontwarn android.app.ProfilerInfo
+-dontwarn android.app.AppOpsManager$**
+-dontwarn android.content.IContentProvider**
+-dontwarn android.content.IIntentReceiver**
+-dontwarn android.content.pm.ILauncherApps**
+-dontwarn android.content.pm.IOnAppsChangedListener**
+-dontwarn android.content.pm.IPackageInstallerCallback**
+-dontwarn android.content.pm.ParceledListSlice
+-dontwarn android.content.pm.UserInfo
+-dontwarn android.content.pm.PackageManagerHidden
+-dontwarn android.hardware.display.IDisplayManager**
+-dontwarn android.hardware.display.IDisplayManagerCallback**
+-dontwarn android.os.BatteryProperty
+-dontwarn android.os.IBatteryPropertiesRegistrar**
+-dontwarn android.os.IDeviceIdleController
+-dontwarn android.os.IDeviceIdleController**
+-dontwarn android.os.IUserManager
+-dontwarn android.os.IUserManager**
+-dontwarn android.os.RemoteCallback**
+-dontwarn android.os.ServiceManager
+-dontwarn android.os.UserHandle$**
+-dontwarn android.view.DisplayInfo
+-dontwarn android.view.IWindowManager**
+-dontwarn com.android.internal.app.**
+-dontwarn com.android.internal.policy.**

app/src/main/AndroidManifest.xml

@@ -5,10 +5,16 @@
     <uses-feature
         android:name="android.software.leanback"
         android:required="false" />
+
     <uses-feature
         android:name="android.hardware.touchscreen"
         android:required="false" />
 
+    <!--  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" />
+
     <application
         android:name="io.github.sds100.keymapper.KeyMapperApp"
         android:allowBackup="true"
@@ -19,6 +25,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme.NoActionBar"
         android:usesCleartextTraffic="true"
+        android:extractNativeLibs="true"
         tools:ignore="GoogleAppIndexingWarning,MissingTvBanner">
         <!--  Allow clear text traffic due to the HTTP Request Action. -->
 

app/src/main/java/io/github/sds100/keymapper/MainFragment.kt

@@ -24,20 +24,24 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import dagger.hilt.android.AndroidEntryPoint
 import io.github.sds100.keymapper.base.BaseMainNavHost
-import io.github.sds100.keymapper.base.actions.ChooseActionScreen
-import io.github.sds100.keymapper.base.actions.ChooseActionViewModel
+import io.github.sds100.keymapper.base.actions.ActionsScreen
+import io.github.sds100.keymapper.base.actions.ConfigActionsViewModel
 import io.github.sds100.keymapper.base.compose.KeyMapperTheme
+import io.github.sds100.keymapper.base.constraints.ConfigConstraintsViewModel
+import io.github.sds100.keymapper.base.constraints.ConstraintsScreen
 import io.github.sds100.keymapper.base.databinding.FragmentComposeBinding
 import io.github.sds100.keymapper.base.home.HomeKeyMapListScreen
+import io.github.sds100.keymapper.base.keymaps.ConfigKeyMapScreen
+import io.github.sds100.keymapper.base.keymaps.ConfigKeyMapViewModel
+import io.github.sds100.keymapper.base.keymaps.KeyMapOptionsScreen
 import io.github.sds100.keymapper.base.utils.navigation.NavDestination
 import io.github.sds100.keymapper.base.utils.navigation.NavigationProviderImpl
 import io.github.sds100.keymapper.base.utils.navigation.SetupNavigation
 import io.github.sds100.keymapper.base.utils.navigation.handleRouteArgs
 import io.github.sds100.keymapper.base.utils.navigation.setupFragmentNavigation
-import io.github.sds100.keymapper.base.utils.ui.DialogProviderImpl
 import io.github.sds100.keymapper.home.HomeViewModel
-import io.github.sds100.keymapper.keymaps.ConfigKeyMapScreen
-import io.github.sds100.keymapper.keymaps.ConfigKeyMapViewModel
+import io.github.sds100.keymapper.trigger.ConfigTriggerViewModel
+import io.github.sds100.keymapper.trigger.TriggerScreen
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -46,9 +50,6 @@ class MainFragment : Fragment() {
     @Inject
     lateinit var navigationProvider: NavigationProviderImpl
 
-    @Inject
-    lateinit var dialogProvider: DialogProviderImpl
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -107,45 +108,84 @@ class MainFragment : Fragment() {
         }
 
         composable<NavDestination.NewKeyMap> { backStackEntry ->
-            val viewModel: ConfigKeyMapViewModel = hiltViewModel()
+            val keyMapViewModel: ConfigKeyMapViewModel = hiltViewModel()
+            val triggerViewModel: ConfigTriggerViewModel = hiltViewModel()
+            val actionsViewModel: ConfigActionsViewModel = hiltViewModel()
+            val constraintsViewModel: ConfigConstraintsViewModel = hiltViewModel()
+            val snackbarHostState = remember { SnackbarHostState() }
 
             backStackEntry.handleRouteArgs<NavDestination.NewKeyMap> { args ->
-                viewModel.loadNewKeyMap(groupUid = args.groupUid)
+                keyMapViewModel.loadNewKeyMap(groupUid = args.groupUid)
 
                 if (args.showAdvancedTriggers) {
-                    viewModel.configTriggerViewModel.showAdvancedTriggersBottomSheet = true
+                    triggerViewModel.showAdvancedTriggersBottomSheet = true
                 }
             }
 
             ConfigKeyMapScreen(
                 modifier = Modifier.fillMaxSize(),
-                viewModel = viewModel,
+                snackbarHostState = snackbarHostState,
+                keyMapViewModel = keyMapViewModel,
+                triggerScreen = {
+                    TriggerScreen(Modifier.fillMaxSize(), triggerViewModel)
+                },
+                actionsScreen = {
+                    ActionsScreen(Modifier.fillMaxSize(), actionsViewModel)
+                },
+                constraintsScreen = {
+                    ConstraintsScreen(
+                        Modifier.fillMaxSize(),
+                        constraintsViewModel,
+                        snackbarHostState,
+                    )
+                },
+                optionsScreen = {
+                    KeyMapOptionsScreen(
+                        Modifier.fillMaxSize(),
+                        triggerViewModel.optionsViewModel,
+                    )
+                },
             )
         }
 
         composable<NavDestination.OpenKeyMap> { backStackEntry ->
-            val viewModel: ConfigKeyMapViewModel = hiltViewModel()
+            val keyMapViewModel: ConfigKeyMapViewModel = hiltViewModel()
+            val triggerViewModel: ConfigTriggerViewModel = hiltViewModel()
+            val actionsViewModel: ConfigActionsViewModel = hiltViewModel()
+            val constraintsViewModel: ConfigConstraintsViewModel = hiltViewModel()
+            val snackbarHostState = remember { SnackbarHostState() }
 
             backStackEntry.handleRouteArgs<NavDestination.OpenKeyMap> { args ->
-                viewModel.loadKeyMap(uid = args.keyMapUid)
+                keyMapViewModel.loadKeyMap(uid = args.keyMapUid)
 
                 if (args.showAdvancedTriggers) {
-                    viewModel.configTriggerViewModel.showAdvancedTriggersBottomSheet = true
+                    triggerViewModel.showAdvancedTriggersBottomSheet = true
                 }
             }
 
             ConfigKeyMapScreen(
                 modifier = Modifier.fillMaxSize(),
-                viewModel = viewModel,
-            )
-        }
-
-        composable<NavDestination.ChooseAction> {
-            val viewModel: ChooseActionViewModel = hiltViewModel()
-
-            ChooseActionScreen(
-                modifier = Modifier.fillMaxSize(),
-                viewModel = viewModel,
+                snackbarHostState = snackbarHostState,
+                keyMapViewModel = keyMapViewModel,
+                triggerScreen = {
+                    TriggerScreen(Modifier.fillMaxSize(), triggerViewModel)
+                },
+                actionsScreen = {
+                    ActionsScreen(Modifier.fillMaxSize(), actionsViewModel)
+                },
+                constraintsScreen = {
+                    ConstraintsScreen(
+                        Modifier.fillMaxSize(),
+                        constraintsViewModel,
+                        snackbarHostState,
+                    )
+                },
+                optionsScreen = {
+                    KeyMapOptionsScreen(
+                        Modifier.fillMaxSize(),
+                        triggerViewModel.optionsViewModel,
+                    )
+                },
             )
         }
     }

app/src/main/java/io/github/sds100/keymapper/home/HomeViewModel.kt

@@ -3,8 +3,8 @@ package io.github.sds100.keymapper.home
 import dagger.hilt.android.lifecycle.HiltViewModel
 import io.github.sds100.keymapper.base.backup.BackupRestoreMappingsUseCase
 import io.github.sds100.keymapper.base.home.BaseHomeViewModel
+import io.github.sds100.keymapper.base.home.ListKeyMapsUseCase
 import io.github.sds100.keymapper.base.home.ShowHomeScreenAlertsUseCase
-import io.github.sds100.keymapper.base.keymaps.ListKeyMapsUseCase
 import io.github.sds100.keymapper.base.keymaps.PauseKeyMapsUseCase
 import io.github.sds100.keymapper.base.onboarding.OnboardingUseCase
 import io.github.sds100.keymapper.base.sorting.SortKeyMapsUseCase