From 7f03cc6fad647b449dba4a83f09837aefb6f6c02 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Mon, 3 Sep 2018 00:40:59 +0200
Subject: msm8996-common: Adapt for local LineageHW java overlays

Change-Id: Icb2b9810217f4b4d442ab83a16f455bd2ed82071
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
---
 BoardConfigCommon.mk                               |  3 +-
 lineagehw/org/lineageos/hardware/KeyDisabler.java  | 45 ----------------------
 .../src/org/lineageos/hardware/KeyDisabler.java    | 45 ++++++++++++++++++++++
 3 files changed, 46 insertions(+), 47 deletions(-)
 delete mode 100644 lineagehw/org/lineageos/hardware/KeyDisabler.java
 create mode 100644 lineagehw/src/org/lineageos/hardware/KeyDisabler.java

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 93f822a..2636434 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -147,8 +147,7 @@ DEVICE_MANIFEST_FILE := $(VENDOR_PATH)/manifest.xml
 DEVICE_MATRIX_FILE := $(VENDOR_PATH)/compatibility_matrix.xml
 
 # Lineage Hardware
-BOARD_HARDWARE_CLASS += \
-    $(VENDOR_PATH)/lineagehw
+JAVA_SOURCE_OVERLAYS := org.lineageos.hardware|$(VENDOR_PATH)/lineagehw|**/*.java
 
 # Partitions
 BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864
diff --git a/lineagehw/org/lineageos/hardware/KeyDisabler.java b/lineagehw/org/lineageos/hardware/KeyDisabler.java
deleted file mode 100644
index 603a280..0000000
--- a/lineagehw/org/lineageos/hardware/KeyDisabler.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2014 The CyanogenMod 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.
- */
-
-package org.lineageos.hardware;
-
-import org.lineageos.internal.util.FileUtils;
-
-/*
- * Disable capacitive keys
- *
- * This is intended for use on devices in which the capacitive keys
- * can be fully disabled for replacement with a soft navbar. You
- * really should not be using this on a device with mechanical or
- * otherwise visible-when-inactive keys
- */
-
-public class KeyDisabler {
-
-    private static String CONTROL_PATH = "/sys/devices/soc/soc:fpc1020/utouch_disable";
-
-    public static boolean isSupported() {
-        return FileUtils.isFileWritable(CONTROL_PATH);
-    }
-
-    public static boolean isActive() {
-        return FileUtils.readOneLine(CONTROL_PATH).equals("1");
-    }
-
-    public static boolean setActive(boolean state) {
-        return FileUtils.writeLine(CONTROL_PATH, (state ? "1" : "0"));
-    }
-}
diff --git a/lineagehw/src/org/lineageos/hardware/KeyDisabler.java b/lineagehw/src/org/lineageos/hardware/KeyDisabler.java
new file mode 100644
index 0000000..603a280
--- /dev/null
+++ b/lineagehw/src/org/lineageos/hardware/KeyDisabler.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2014 The CyanogenMod 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.
+ */
+
+package org.lineageos.hardware;
+
+import org.lineageos.internal.util.FileUtils;
+
+/*
+ * Disable capacitive keys
+ *
+ * This is intended for use on devices in which the capacitive keys
+ * can be fully disabled for replacement with a soft navbar. You
+ * really should not be using this on a device with mechanical or
+ * otherwise visible-when-inactive keys
+ */
+
+public class KeyDisabler {
+
+    private static String CONTROL_PATH = "/sys/devices/soc/soc:fpc1020/utouch_disable";
+
+    public static boolean isSupported() {
+        return FileUtils.isFileWritable(CONTROL_PATH);
+    }
+
+    public static boolean isActive() {
+        return FileUtils.readOneLine(CONTROL_PATH).equals("1");
+    }
+
+    public static boolean setActive(boolean state) {
+        return FileUtils.writeLine(CONTROL_PATH, (state ? "1" : "0"));
+    }
+}
-- 
cgit v1.2.3