From a2f98f5784ca16222d3ba2add9683bfcba9ab4cf Mon Sep 17 00:00:00 2001
From: Nolen Johnson <johnsonnolen@gmail.com>
Date: Mon, 13 Dec 2021 14:18:04 -0500
Subject: [PATCH] Revert "sabrina: build & overlay KeyHandler"

* Commonized now.

This reverts commit f566dda243d1b350849d38a1c6bfc2472d45a35c.

Change-Id: Ice8249f96131f3c625f5b36979c07ff88b64a958
---
 device.mk                                     |  7 +------
 .../atv/KeyHandler/res/values/config.xml      | 20 -------------------
 .../lineage/res/res/values/config.xml         | 18 -----------------
 3 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 overlay-lineage/device/lineage/atv/KeyHandler/res/values/config.xml
 delete mode 100644 overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml

diff --git a/device.mk b/device.mk
index 06956f9..642a4c4 100644
--- a/device.mk
+++ b/device.mk
@@ -21,18 +21,13 @@ PRODUCT_COPY_FILES += \
     $(DEVICE_PATH)/init-files/init.amlogic.sku.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.sku.rc \
     $(DEVICE_PATH)/init-files/init.amlogic.wifi_buildin.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi_buildin.rc
 
-## Keyhandler
-PRODUCT_PACKAGES += \
-    KeyHandler
-
 ## Kernel Modules
 PRODUCT_PACKAGES += \
     dhd
 
 ## Overlays
 DEVICE_PACKAGE_OVERLAYS += \
-    $(DEVICE_PATH)/overlay \
-    $(DEVICE_PATH)/overlay-lineage
+    $(DEVICE_PATH)/overlay
 
 ## Wi-Fi
 TARGET_DHD_VERSION := bcmdhd.100.10.545.x
diff --git a/overlay-lineage/device/lineage/atv/KeyHandler/res/values/config.xml b/overlay-lineage/device/lineage/atv/KeyHandler/res/values/config.xml
deleted file mode 100644
index 24e22ed..0000000
--- a/overlay-lineage/device/lineage/atv/KeyHandler/res/values/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The LineageOS Project
-
-     SPDX-License-Identifier: Apache-2.0
--->
-<resources>
-    <!-- Array of keycodes for special keys on device.
-         Order & size must match with keyhandler_packages -->
-    <integer-array name="keyhandler_keycodes">
-        <item>189</item>
-        <item>190</item>
-    </integer-array>
-
-    <!-- Array of packages for special keys on device.
-         Order & size must match with keyhandler_keycodes -->
-    <string-array name="keyhandler_packages">
-        <item>com.google.android.youtube.tv</item>
-        <item>com.netflix.mediaclient</item>
-    </string-array>
-</resources>
diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
deleted file mode 100644
index 59d47a9..0000000
--- a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The LineageOS Project
-
-     SPDX-License-Identifier: Apache-2.0
--->
-<resources>
-    <!-- Paths to the libraries that contain device specific key handlers -->
-    <string-array name="config_deviceKeyHandlerLibs" translatable="false">
-        <item>/system/priv-app/LineageParts/LineageParts.apk</item>
-        <item>/system/priv-app/KeyHandler/KeyHandler.apk</item>
-    </string-array>
-
-    <!-- Names of the key handler classes -->
-    <string-array name="config_deviceKeyHandlerClasses" translatable="false">
-        <item>org.lineageos.lineageparts.gestures.KeyHandler</item>
-        <item>org.lineageos.settings.device.KeyHandler</item>
-    </string-array>
-</resources>
-- 
2.20.1