From 97334106558a760ed8de08e716f84e6ba8c48b76 Mon Sep 17 00:00:00 2001
From: Ed <ed@geraghty.london>
Date: Fri, 15 Jan 2021 23:58:59 +0000
Subject: [PATCH] Oukitel WP8 Pro Overlay

Acting on the feedback from the previous commit (which also makes it region ambivalent).

Signed-off-by: Ed Geraghty <ed@geraghty.london>
---
 Oukitel/{WP8PROEEA => WP8PRO}/Android.mk                | 2 +-
 Oukitel/{WP8PROEEA => WP8PRO}/AndroidManifest.xml       | 4 ++--
 Oukitel/{WP8PROEEA => WP8PRO}/res/values/bools.xml      | 0
 Oukitel/{WP8PROEEA => WP8PRO}/res/values/strings.xml    | 1 -
 Oukitel/{WP8PROEEA => WP8PRO}/res/xml/power_profile.xml | 0
 Oukitel/WP8PROEEA/res/values/integers.xml               | 4 ----
 overlay.mk                                              | 1 +
 7 files changed, 4 insertions(+), 8 deletions(-)
 rename Oukitel/{WP8PROEEA => WP8PRO}/Android.mk (80%)
 rename Oukitel/{WP8PROEEA => WP8PRO}/AndroidManifest.xml (72%)
 rename Oukitel/{WP8PROEEA => WP8PRO}/res/values/bools.xml (100%)
 rename Oukitel/{WP8PROEEA => WP8PRO}/res/values/strings.xml (57%)
 rename Oukitel/{WP8PROEEA => WP8PRO}/res/xml/power_profile.xml (100%)
 delete mode 100644 Oukitel/WP8PROEEA/res/values/integers.xml

diff --git a/Oukitel/WP8PROEEA/Android.mk b/Oukitel/WP8PRO/Android.mk
similarity index 80%
rename from Oukitel/WP8PROEEA/Android.mk
rename to Oukitel/WP8PRO/Android.mk
index 032ff68..6fb0e68 100644
--- a/Oukitel/WP8PROEEA/Android.mk
+++ b/Oukitel/WP8PRO/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := treble-overlay-oukitel-wp8proeea
+LOCAL_PACKAGE_NAME := treble-overlay-oukitel-wp8pro
 LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Oukitel/WP8PROEEA/AndroidManifest.xml b/Oukitel/WP8PRO/AndroidManifest.xml
similarity index 72%
rename from Oukitel/WP8PROEEA/AndroidManifest.xml
rename to Oukitel/WP8PRO/AndroidManifest.xml
index 3c08301..4c71bc7 100644
--- a/Oukitel/WP8PROEEA/AndroidManifest.xml
+++ b/Oukitel/WP8PRO/AndroidManifest.xml
@@ -1,10 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="me.phh.treble.overlay.oukitel.wp8proeea"
+        package="me.phh.treble.overlay.oukitel.wp8pro"
         android:versionCode="1"
         android:versionName="1.0">
         <overlay android:targetPackage="android"
                 android:requiredSystemPropertyName="ro.vendor.build.fingerprint"
-		android:requiredSystemPropertyValue="+OUKITEL/WP8_Pro_EEA/WP8_Pro*"
+		android:requiredSystemPropertyValue="+OUKITEL/WP8_Pro*"
 		android:priority="238"
 		android:isStatic="true" />
 </manifest>
diff --git a/Oukitel/WP8PROEEA/res/values/bools.xml b/Oukitel/WP8PRO/res/values/bools.xml
similarity index 100%
rename from Oukitel/WP8PROEEA/res/values/bools.xml
rename to Oukitel/WP8PRO/res/values/bools.xml
diff --git a/Oukitel/WP8PROEEA/res/values/strings.xml b/Oukitel/WP8PRO/res/values/strings.xml
similarity index 57%
rename from Oukitel/WP8PROEEA/res/values/strings.xml
rename to Oukitel/WP8PRO/res/values/strings.xml
index 8c5622c..68ccdcd 100644
--- a/Oukitel/WP8PROEEA/res/values/strings.xml
+++ b/Oukitel/WP8PRO/res/values/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="config_defaultListenerAccessPackages">com.ssui.launcher3:com.android.calendar:com.ssui.push:com.ssui.gmodel:com.android.launcher3:com.google.android.setupwizard:com.google.android.apps.restore:com.google.android.projection.gearhead</string>
     <string name="config_mainBuiltInDisplayCutout">m-11.68968,17.05696c2.62968,6.21568 7.08857,9.6944 11.70693,9.6944s9.07725,-3.47873 11.70693,-9.6944m-0.00313,0c4.58083,-10.81477 12.24164,-17.04067 20.28077,-17.04067l-63.97539,0c8.04226,0 15.69992,6.2259 20.28077,17.04067 @dp</string>
 </resources>
diff --git a/Oukitel/WP8PROEEA/res/xml/power_profile.xml b/Oukitel/WP8PRO/res/xml/power_profile.xml
similarity index 100%
rename from Oukitel/WP8PROEEA/res/xml/power_profile.xml
rename to Oukitel/WP8PRO/res/xml/power_profile.xml
diff --git a/Oukitel/WP8PROEEA/res/values/integers.xml b/Oukitel/WP8PROEEA/res/values/integers.xml
deleted file mode 100644
index 203a181..0000000
--- a/Oukitel/WP8PROEEA/res/values/integers.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <integer name="config_doubleTapOnHomeBehavior">2</integer>
-</resources>
diff --git a/overlay.mk b/overlay.mk
index 48a1bcd..78fd66b 100755
--- a/overlay.mk
+++ b/overlay.mk
@@ -71,6 +71,7 @@ PRODUCT_PACKAGES += \
 	treble-overlay-oneplus-op6 \
 	treble-overlay-oneplus-op6t \
 	treble-overlay-oneplus-op6t-systemui \
+	treble-overlay-oukitel-wp8pro \
 	treble-overlay-razer-cheryl \
 	treble-overlay-realme-6 \
 	treble-overlay-realme-6i \