Merge remote-tracking branch 'phh/master' into HEAD

diff --git a/Essential-PH1/Android.mk b/Essential-PH1/Android.mk
new file mode 100644
index 0000000..9db9991
--- /dev/null
+++ b/Essential-PH1/Android.mk
@@ -0,0 +1,6 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-Essential_PH1
+LOCAL_PRIVATE_PLATFORM_APIS := true
+include $(BUILD_PACKAGE)
diff --git a/Essential-PH1/AndroidManifest.xml b/Essential-PH1/AndroidManifest.xml
new file mode 100644
index 0000000..7ae7193
--- /dev/null
+++ b/Essential-PH1/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.essential_ph1"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="android"
+                android:priority="3"/>
+</manifest>
diff --git a/Essential-PH1/res/values-land/config.xml b/Essential-PH1/res/values-land/config.xml
new file mode 100644
index 0000000..0d3f7a8
--- /dev/null
+++ b/Essential-PH1/res/values-land/config.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright (C) 2016 The CyanogenMod Project
+** Copyright (C) 2017-2018 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.
+*/
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Whether device has a notch -->
+    <bool name="config_haveNotch">true</bool>
+    <bool name="config_showNavigationBar">true</bool>
+	<bool name="config_supportSystemNavigationKeys">true</bool>
+
+</resources>
diff --git a/Essential-PH1/res/values-land/notch.xml b/Essential-PH1/res/values-land/notch.xml
new file mode 100644
index 0000000..8644083
--- /dev/null
+++ b/Essential-PH1/res/values-land/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<dimen name="status_bar_height">24px</dimen>
+</resources>
diff --git a/Essential-PH1/res/values/config.xml b/Essential-PH1/res/values/config.xml
new file mode 100644
index 0000000..0d3f7a8
--- /dev/null
+++ b/Essential-PH1/res/values/config.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright (C) 2016 The CyanogenMod Project
+** Copyright (C) 2017-2018 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.
+*/
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Whether device has a notch -->
+    <bool name="config_haveNotch">true</bool>
+    <bool name="config_showNavigationBar">true</bool>
+	<bool name="config_supportSystemNavigationKeys">true</bool>
+
+</resources>
diff --git a/Essential-PH1/res/values/notch.xml b/Essential-PH1/res/values/notch.xml
new file mode 100644
index 0000000..96ef1e5
--- /dev/null
+++ b/Essential-PH1/res/values/notch.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<dimen name="status_bar_height">144px</dimen>
+</resources>
diff --git a/Huawei/HwCamera2/Android.mk b/Huawei/HwCamera2/Android.mk
new file mode 100644
index 0000000..9d82f41
--- /dev/null
+++ b/Huawei/HwCamera2/Android.mk
@@ -0,0 +1,13 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := HwCamera2
+LOCAL_MODULE_OWNER := honor
+LOCAL_SRC_FILES := HwCamera2.apk
+LOCAL_CERTIFICATE := shared
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_MODULE_SUFFIX := .apk
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_DEX_PREOPT := false
+include $(BUILD_PREBUILT)
diff --git a/Huawei/HwCamera2/HwCamera2.apk b/Huawei/HwCamera2/HwCamera2.apk
new file mode 100644
index 0000000..73c79a2
--- /dev/null
+++ b/Huawei/HwCamera2/HwCamera2.apk
Binary files differ
diff --git a/Huawei/HwCamera2/lib/android.hidl.base@1.0.so b/Huawei/HwCamera2/lib/android.hidl.base@1.0.so
new file mode 100644
index 0000000..5d98e72
--- /dev/null
+++ b/Huawei/HwCamera2/lib/android.hidl.base@1.0.so
Binary files differ
diff --git a/Huawei/HwCamera2/lib64/android.hidl.base@1.0.so b/Huawei/HwCamera2/lib64/android.hidl.base@1.0.so
new file mode 100644
index 0000000..4d0a951
--- /dev/null
+++ b/Huawei/HwCamera2/lib64/android.hidl.base@1.0.so
Binary files differ
diff --git a/Huawei/HwCamera2/lib64/libHwPostCamera_jni.so b/Huawei/HwCamera2/lib64/libHwPostCamera_jni.so
new file mode 100644
index 0000000..ec55254
--- /dev/null
+++ b/Huawei/HwCamera2/lib64/libHwPostCamera_jni.so
Binary files differ
diff --git a/Huawei/libhidl/Android.mk b/Huawei/libhidl/Android.mk
new file mode 100644
index 0000000..25e165d
--- /dev/null
+++ b/Huawei/libhidl/Android.mk
@@ -0,0 +1,30 @@
+#
+# Copyright (C) 2017 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_SHARED_LIBRARIES := libhidltransport
+LOCAL_MODULE := android.hidl.base@1.0
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_SHARED_LIBRARIES := libhidltransport
+LOCAL_MODULE := android.hidl.manager@1.0
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+include $(BUILD_SHARED_LIBRARY)
diff --git a/Picker/src/me/phh/treble/overlaypicker/Starter.java b/Picker/src/me/phh/treble/overlaypicker/Starter.java
index fd6bc4e..ecd39f1 100644
--- a/Picker/src/me/phh/treble/overlaypicker/Starter.java
+++ b/Picker/src/me/phh/treble/overlaypicker/Starter.java
@@ -32,6 +32,18 @@
 			setOverlayEnabled("me.phh.treble.overlay.navbar", true);
 	}
 
+	private void handleNightmode(Context ctxt) {
+		if("msm8998".equals(platform)) {
+			Log.d("OverlayPicker", "Enabling nightmode");
+			setOverlayEnabled("me.phh.treble.overlay.nightmode", true);
+		}
+	}
+
+	private void handleEssentialPh1(Context ctxt) {
+		if("Mata".equals(productBoard))
+			setOverlayEnabled("me.phh.treble.overlay.essential_ph1", true);
+	}
+
 	private void enableLte(Context ctxt) {
 		//TODO: List here all non-LTE platforms
 		if(!"mt6580".equals(platform))
@@ -44,6 +56,8 @@
 				ServiceManager.getService(Context.OVERLAY_SERVICE));
 
 		handleHtc(ctxt);
+		handleNightmode(ctxt);
+		handleEssentialPh1(ctxt);
 		enableLte(ctxt);
 
 		setOverlayEnabled("me.phh.treble.overlay.systemui.falselocks", true);
diff --git a/Sharp/S2-los/Android.mk b/Sharp/S2-los/Android.mk
new file mode 100644
index 0000000..4f45e9d
--- /dev/null
+++ b/Sharp/S2-los/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-sharp-s2-los
+LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
+LOCAL_PRIVATE_PLATFORM_APIS := true
+include $(BUILD_PACKAGE)
diff --git a/Sharp/S2-los/AndroidManifest.xml b/Sharp/S2-los/AndroidManifest.xml
new file mode 100644
index 0000000..7f2c5bb
--- /dev/null
+++ b/Sharp/S2-los/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.sharp.s2.los"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="org.lineageos.lineagesettings"
+                android:requiredSystemPropertyName="ro.product.board"
+                android:requiredSystemPropertyValue="SAT"
+		android:priority="19"
+		android:isStatic="true" />
+</manifest>
diff --git a/Sharp/S2-los/res/values/config.xml b/Sharp/S2-los/res/values/config.xml
new file mode 100644
index 0000000..0c506eb
--- /dev/null
+++ b/Sharp/S2-los/res/values/config.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright (C) 2016 The CyanogenMod Project
+** Copyright (C) 2017-2018 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.
+*/
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- All the capabilities of the LEDs on this device, stored as a bit field.
+         This integer should equal the sum of the corresponding value for each
+         of the following capabilities present:
+
+         // Device has a color adjustable battery light.
+         LIGHTS_RGB_NOTIFICATION_LED = 1
+
+         // Device has a color adjustable notification light.
+         LIGHTS_RGB_BATTERY_LED = 2
+
+         LIGHTS_MULTIPLE_NOTIFICATION_LED = 4 (deprecated)
+
+         // The notification light has adjustable pulsing capability.
+         LIGHTS_PULSATING_LED = 8
+
+         // Device has a multi-segment battery light that is able to
+         // use the light brightness value to determine how many
+         // segments to show (in order to represent battery level).
+         LIGHTS_SEGMENTED_BATTERY_LED = 16
+
+         // The notification light supports HAL adjustable brightness
+         // via the alpha channel.
+         // Note: if a device notification light supports LIGHTS_RGB_NOTIFICATION_LED
+         // then HAL support is not necessary for brightness control.  In this case,
+         // brightness support will be provided by lineage-sdk through the scaling of
+         // RGB color values.
+         LIGHTS_ADJUSTABLE_NOTIFICATION_LED_BRIGHTNESS = 32
+
+         // Device has a battery light.
+         LIGHTS_BATTERY_LED = 64
+
+         // The battery light supports HAL adjustable brightness via
+         // the alpha channel.
+         // Note: if a device battery light supports LIGHTS_RGB_BATTERY_LED then HAL
+         // support is not necessary for brightness control.  In this case,
+         // brightness support will be provided by lineage-sdk through the scaling of
+         // RGB color values.
+         LIGHTS_ADJUSTABLE_BATTERY_LED_BRIGHTNESS = 128
+
+         For example, a device with notification and battery lights that supports
+         pulsating and RGB control would set this config to 75. -->
+    <integer name="config_deviceLightCapabilities">75</integer>
+
+    <!-- Whether device has screen with higher aspect ratio -->
+    <bool name="config_haveHigherAspectRatioScreen">true</bool>
+
+    <!-- Whether device has a notch -->
+    <bool name="config_haveNotch">true</bool>
+
+</resources>
diff --git a/Sharp/S2-snap/Android.mk b/Sharp/S2-snap/Android.mk
new file mode 100644
index 0000000..fbc3e63
--- /dev/null
+++ b/Sharp/S2-snap/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-sharp-s2-snap
+LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
+LOCAL_PRIVATE_PLATFORM_APIS := true 
+include $(BUILD_PACKAGE)
diff --git a/Sharp/S2-snap/AndroidManifest.xml b/Sharp/S2-snap/AndroidManifest.xml
new file mode 100644
index 0000000..90e20fe
--- /dev/null
+++ b/Sharp/S2-snap/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.sharp.s2.snap"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="org.lineageos.snap"
+                android:requiredSystemPropertyName="ro.product.board"
+                android:requiredSystemPropertyValue="SAT"
+		android:priority="19"
+		android:isStatic="true" />
+</manifest>
diff --git a/Sharp/S2-snap/res/values/arrays.xml b/Sharp/S2-snap/res/values/arrays.xml
new file mode 100644
index 0000000..b734519
--- /dev/null
+++ b/Sharp/S2-snap/res/values/arrays.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2008 The Android Open Source 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.
+ -->
+
+<resources>
+
+    <array name="camera_id_entries" translatable="false">
+        <item>@string/pref_camera_id_entry_back</item>
+        <item>@string/pref_camera_id_entry_back</item>
+        <item>@string/pref_camera_id_entry_front</item>
+    </array>
+
+</resources>
diff --git a/Sharp/S2-snap/res/values/cm_strings.xml b/Sharp/S2-snap/res/values/cm_strings.xml
new file mode 100644
index 0000000..2b17c03
--- /dev/null
+++ b/Sharp/S2-snap/res/values/cm_strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013-2015 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="pref_camera_scenemode_entry_sports">Burst</string>
+    <string name="pref_camera_scenemode_entry_steadyphoto">ClearShot</string>
+
+</resources>
diff --git a/Sharp/S2-snap/res/values/config.xml b/Sharp/S2-snap/res/values/config.xml
new file mode 100644
index 0000000..4bdc0d5
--- /dev/null
+++ b/Sharp/S2-snap/res/values/config.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source 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.
+-->
+
+<!-- Camera app resources that may need to be customized
+     for different hardware or product builds. -->
+<resources>
+
+    <!-- Opens back camera using openLegacy() and forces api v1 -->
+    <bool name="back_camera_open_legacy">false</bool>
+
+    <!-- Opens front camera using openLegacy() and forces api v1 -->
+    <bool name="front_camera_open_legacy">false</bool>
+
+    <!-- Restart preview for back camera onPictureTaken -->
+    <bool name="back_camera_restart_preview_onPictureTaken">true</bool>
+
+    <!-- Restart preview for front camera onPictureTaken -->
+    <bool name="front_camera_restart_preview_onPictureTaken">true</bool>
+
+    <!-- Force use a specific preview-size
+         Example: 1920x1080 -->
+    <string name="preview_size_for_photo">1920x1080</string>
+
+    <!-- Enable support for camera api v2 -->
+    <bool name="support_camera_api_v2">true</bool>
+
+</resources>
diff --git a/Sharp/S2-snap/res/values/dimens.xml b/Sharp/S2-snap/res/values/dimens.xml
new file mode 100644
index 0000000..efb42ab
--- /dev/null
+++ b/Sharp/S2-snap/res/values/dimens.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2013, The Android Open Source 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.
+-->
+<resources>
+
+    <dimen name="preview_top_margin">242px</dimen>
+    <dimen name="camera_controls_top_padding">121px</dimen>
+
+</resources>
diff --git a/Sharp/S2-snap/res/values/qcomstrings.xml b/Sharp/S2-snap/res/values/qcomstrings.xml
new file mode 100644
index 0000000..44172f3
--- /dev/null
+++ b/Sharp/S2-snap/res/values/qcomstrings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2012-2014, The Linux Foundation. All rights reserved.
+              (C) 2014-2016 The CyanogenMod Project
+              (C) 2017 The LineageOS Project
+
+    Not a Contribution.
+
+    Copyright (C) 2007 The Android Open Source 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.
+-->
+<resources>
+    <!-- HDR needs 1x frame -->
+    <string name="pref_camera_hdr_need_1x_default" translatable="false">false</string>
+    <string name="pref_camera_scenedetect_default" translatable="false">on</string>
+    <string name="pref_camera_dis_default" translatable="false">enable</string>
+    <string name="pref_video_quality_default" translatable="false">1920x1080</string>
+</resources>
diff --git a/Sharp/S2-snap/res/values/strings.xml b/Sharp/S2-snap/res/values/strings.xml
new file mode 100644
index 0000000..6e16afe
--- /dev/null
+++ b/Sharp/S2-snap/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2013, The Android Open Source 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.
+-->
+<resources>
+
+    <!-- In select camera setting, back facing camera. [CHAR LIMIT=14] -->
+    <string name="pref_camera_id_entry_back">Back</string>
+    <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] -->
+    <string name="pref_camera_id_entry_front">Front</string>
+
+</resources>
diff --git a/overlay.mk b/overlay.mk
index 749b4c7..399c7e5 100644
--- a/overlay.mk
+++ b/overlay.mk
@@ -6,8 +6,11 @@
 	treble-overlay-lg-g7 \
 	treble-overlay-NavBar \
 	treble-overlay-NightMode \
+	treble-overlay-Essential_PH1 \
 	treble-overlay-Telephony-LTE \
 	treble-overlay-sharp-s2 \
+	treble-overlay-sharp-s2-los \
+	treble-overlay-sharp-s2-snap \
 	treble-overlay-SystemUI-FalseLocks \
 	treble-overlay-devinputjack \
 	treble-overlay-oneplus-op6 \
@@ -21,8 +24,19 @@
 	treble-overlay-xiaomi-redmi6pro \
 	treble-overlay-xiaomi-mia2lite \
 	HardwareOverlayPicker \
-	QtiAudio
+	QtiAudio \
+	Touchscreen \
+        android.hidl.base@1.0 \
+        android.hidl.manager@1.0
 
+# Huawei Camera
+PRODUCT_COPY_FILES += \
+    vendor/hardware_overlay/Huawei/HwCamera2/lib/android.hidl.base@1.0.so:system/lib/android.hid$
+    vendor/hardware_overlay/Huawei/HwCamera2/lib64/android.hidl.base@1.0.so:system/lib64/android$
+    vendor/hardware_overlay/Huawei/HwCamera2/lib64/libHwPostCamera_jni.so:system/lib64/libHwPost$
+
+PRODUCT_PACKAGES += \
+    HwCamera2
 
 PRODUCT_PACKAGES += \
 	hw-fpnav-daemon