From 22dd5c85008a2ce4d803a632bde18e4c4769269d Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Fri, 25 Apr 2025 17:36:15 +0100
Subject: [PATCH] sm8550-common: Switch to Touch AIDL

Change-Id: I92a19fedb9ea482616c2e3d550e30b69d2a3a5c7
---
 common.mk                                |  3 +--
 manifest_odm.xml                         | 15 ---------------
 touch/include/TouchscreenGestureConfig.h | 21 ++++-----------------
 3 files changed, 5 insertions(+), 34 deletions(-)
 delete mode 100644 manifest_odm.xml

diff --git a/common.mk b/common.mk
index 80e1804..edd8290 100644
--- a/common.mk
+++ b/common.mk
@@ -363,7 +363,7 @@ PRODUCT_PACKAGES += \
 
 # Touch
 PRODUCT_PACKAGES += \
-    vendor.lineage.touch@1.0-service.oplus
+    vendor.lineage.touch-service.oplus
 
 $(call soong_config_set,OPLUS_LINEAGE_TOUCH_HAL,INCLUDE_DIR,$(LOCAL_PATH)/touch/include)
 
@@ -420,7 +420,6 @@ DEVICE_MANIFEST_FILE := \
     $(LOCAL_PATH)/network_manifest.xml
 
 ODM_MANIFEST_FILES := \
-    $(LOCAL_PATH)/manifest_odm.xml \
     $(LOCAL_PATH)/network_manifest_odm.xml
 
 # WiFi
diff --git a/manifest_odm.xml b/manifest_odm.xml
deleted file mode 100644
index 928a70b..0000000
--- a/manifest_odm.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<manifest version="2.0" type="device">
-    <hal format="hidl" override="true">
-        <name>vendor.lineage.touch</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IHighTouchPollingRate</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>ITouchscreenGesture</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</manifest>
diff --git a/touch/include/TouchscreenGestureConfig.h b/touch/include/TouchscreenGestureConfig.h
index 03d83b5..41c167a 100644
--- a/touch/include/TouchscreenGestureConfig.h
+++ b/touch/include/TouchscreenGestureConfig.h
@@ -1,28 +1,16 @@
 /*
- * Copyright (C) 2022 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-FileCopyrightText: 2025 The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #pragma once
 
 #include "TouchscreenGesture.h"
 
+namespace aidl {
 namespace vendor {
 namespace lineage {
 namespace touch {
-namespace V1_0 {
-namespace implementation {
 
 const int TouchscreenGesture::kSupportedGestures = makeBitField(
         kGestureUpVee, kGestureDownVee, kGestureLeftVee, kGestureRightVee,
@@ -30,8 +18,7 @@ const int TouchscreenGesture::kSupportedGestures = makeBitField(
         kGestureLeftToRight, kGestureRightToLeft, kGestureUpToDown, kGestureDownToUp,
         kGestureM, kGestureW, kGestureSingleTap);
 
-}  // namespace implementation
-}  // namespace V1_0
 }  // namespace touch
 }  // namespace lineage
 }  // namespace vendor
+}  // namespace aidl