scorpio: Switch to common Touch AIDL from hardware/xiaomi

Change-Id: Ic9512ce8391887dba23df769d3c3896d1a7051a3

BoardConfig.mk

@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2016 The CyanogenMod Project
-# Copyright (C) 2017-2018,2020-2022 The LineageOS Project
+# Copyright (C) 2017-2018,2020-2022,2025 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -25,9 +25,6 @@ TARGET_OTA_ASSERT_DEVICE := scorpio
 # Board
 TARGET_BOARD_INFO_FILE := $(DEVICE_PATH)/board-info.txt
 
-# HIDL
-DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml
-
 # Kernel
 TARGET_KERNEL_CONFIG += vendor/xiaomi/scorpio.config
 

device.mk

@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2016 The CyanogenMod Project
-# Copyright (C) 2017-2020,2022,2024 The LineageOS Project
+# Copyright (C) 2017-2020,2022,2024-2025 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -61,7 +61,10 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # Touch HAL
 PRODUCT_PACKAGES += \
-    vendor.lineage.touch@1.0-service.xiaomi_8996
+    vendor.lineage.touch-service.xiaomi
+
+$(call soong_config_set,XIAOMI_TOUCH,KEY_DISABLER_CONTROL_PATH,/proc/touchpanel/capacitive_keys_enable)
+$(call soong_config_set,XIAOMI_TOUCH,KEY_SWAPPER_CONTROL_PATH,/proc/touchpanel/reversed_keys_enable)
 
 # Thermal
 PRODUCT_COPY_FILES += \

manifest.xml

@@ -1,15 +0,0 @@
-<manifest version="1.0" type="device">
-    <hal format="hidl">
-        <name>vendor.lineage.touch</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IKeyDisabler</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>IKeySwapper</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</manifest>