From 91462a6b72ad6ea34a9b018c274d1e72a7bbce8a Mon Sep 17 00:00:00 2001
From: Alberto Ponces <ponces26@gmail.com>
Date: Fri, 14 Jan 2022 17:33:48 +0000
Subject: [PATCH] Group high priority overlay configs on a single package

---
 {Gestures => HighPriorityMisc}/Android.mk                 | 2 +-
 {Gestures => HighPriorityMisc}/AndroidManifest.xml        | 6 +++---
 {Gestures => HighPriorityMisc}/res/values/config.xml      | 1 +
 .../res/xml/config_webview_packages.xml                   | 0
 Webview/Android.mk                                        | 8 --------
 Webview/AndroidManifest.xml                               | 8 --------
 overlay.mk                                                | 3 +--
 7 files changed, 6 insertions(+), 22 deletions(-)
 rename {Gestures => HighPriorityMisc}/Android.mk (82%)
 rename {Gestures => HighPriorityMisc}/AndroidManifest.xml (66%)
 rename {Gestures => HighPriorityMisc}/res/values/config.xml (60%)
 rename {Webview => HighPriorityMisc}/res/xml/config_webview_packages.xml (100%)
 delete mode 100644 Webview/Android.mk
 delete mode 100644 Webview/AndroidManifest.xml

diff --git a/Gestures/Android.mk b/HighPriorityMisc/Android.mk
similarity index 82%
rename from Gestures/Android.mk
rename to HighPriorityMisc/Android.mk
index 78e89fc..f49d1b3 100644
--- a/Gestures/Android.mk
+++ b/HighPriorityMisc/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := treble-overlay-gestures
+LOCAL_PACKAGE_NAME := treble-overlay-highpriomisc
 LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Gestures/AndroidManifest.xml b/HighPriorityMisc/AndroidManifest.xml
similarity index 66%
rename from Gestures/AndroidManifest.xml
rename to HighPriorityMisc/AndroidManifest.xml
index a588e50..3ecba55 100644
--- a/Gestures/AndroidManifest.xml
+++ b/HighPriorityMisc/AndroidManifest.xml
@@ -1,9 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="me.phh.treble.overlay.gestures"
+        package="me.phh.treble.overlay.highpriomisc"
         android:versionCode="1"
         android:versionName="1.0">
-    <!-- SUPER OVERLAY -->
+        <!-- SUPER OVERLAY -->
         <overlay android:targetPackage="android"
-            android:priority="933"
+            android:priority="8998"
             android:isStatic="true" />
 </manifest>
diff --git a/Gestures/res/values/config.xml b/HighPriorityMisc/res/values/config.xml
similarity index 60%
rename from Gestures/res/values/config.xml
rename to HighPriorityMisc/res/values/config.xml
index 789abb4..55ccc9a 100644
--- a/Gestures/res/values/config.xml
+++ b/HighPriorityMisc/res/values/config.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Whether or not swipe up gesture's opt-in setting is available on this device -->
     <bool name="config_swipe_up_gesture_setting_available">true</bool>
 </resources>
diff --git a/Webview/res/xml/config_webview_packages.xml b/HighPriorityMisc/res/xml/config_webview_packages.xml
similarity index 100%
rename from Webview/res/xml/config_webview_packages.xml
rename to HighPriorityMisc/res/xml/config_webview_packages.xml
diff --git a/Webview/Android.mk b/Webview/Android.mk
deleted file mode 100644
index 67290a2..0000000
--- a/Webview/Android.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := treble-overlay-webview
-LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
-LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
-LOCAL_PRIVATE_PLATFORM_APIS := true
-include $(BUILD_PACKAGE)
diff --git a/Webview/AndroidManifest.xml b/Webview/AndroidManifest.xml
deleted file mode 100644
index 99e6f58..0000000
--- a/Webview/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="me.phh.treble.overlay.webview"
-        android:versionCode="1"
-        android:versionName="1.0">
-        <overlay android:targetPackage="android"
-		android:priority="9000"
-		android:isStatic="true" />
-</manifest>
diff --git a/overlay.mk b/overlay.mk
index 8f11e38..34c4e8d 100755
--- a/overlay.mk
+++ b/overlay.mk
@@ -21,7 +21,7 @@ PRODUCT_PACKAGES += \
 	treble-overlay-duoqin-qin2pro \
 	treble-overlay-essential-ph_1 \
 	treble-overlay-fairphone-fp3 \
-	treble-overlay-gestures \
+	treble-overlay-highpriomisc \
 	treble-overlay-htc-exodus1 \
 	treble-overlay-htc-u12plus \
 	treble-overlay-huawei \
@@ -169,7 +169,6 @@ PRODUCT_PACKAGES += \
 	treble-overlay-umidigi-power \
 	treble-overlay-unihertz-jelly2 \
 	treble-overlay-vsmart-live \
-	treble-overlay-webview \
 	treble-overlay-wifi5g \
 	treble-overlay-xiaomi-mi11lite5g \
 	treble-overlay-xiaomi-mi6x \