From 0eff75e323439b9ac46c55119ddfbdf98b810c58 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 26 Oct 2020 23:03:36 +0100
Subject: [PATCH] Fix tests for Q target

---
 Asus/ZenFoneMaxShot/res/values/notch.xml | 2 --
 Moto/G8Plus/res/values/config.xml        | 1 -
 Moto/G8Power/res/values/config.xml       | 1 -
 Moto/OneHyper/res/values/config.xml      | 1 -
 Realme/6/AndroidManifest.xml             | 2 +-
 overlay.mk                               | 3 +--
 6 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Asus/ZenFoneMaxShot/res/values/notch.xml b/Asus/ZenFoneMaxShot/res/values/notch.xml
index 46e67cf..c5d9646 100644
--- a/Asus/ZenFoneMaxShot/res/values/notch.xml
+++ b/Asus/ZenFoneMaxShot/res/values/notch.xml
@@ -19,8 +19,6 @@
 <resources>
     <!-- Height of the status bar in portrait -->
     <dimen name="status_bar_height_portrait">81px</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">81px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">81px</dimen>
     <string translatable="false" name="config_mainBuiltInDisplayCutout">M 0,0 L -58, 0 L -40.9940446283, 10.0595537175 L -35, 27 L -35, 10.0595537175 L 35.2, 10.0595537175 L 35, 27 L 40, 0 Z @dp</string>
diff --git a/Moto/G8Plus/res/values/config.xml b/Moto/G8Plus/res/values/config.xml
index 4662e6e..7be6249 100644
--- a/Moto/G8Plus/res/values/config.xml
+++ b/Moto/G8Plus/res/values/config.xml
@@ -27,7 +27,6 @@
     <bool name="config_wifi_dual_band_support">true</bool>
     <bool name="config_displayBlanksAfterDoze">false</bool>
     <bool name="skip_restoring_network_selection">true</bool>
-    <dimen name="status_bar_height">80px</dimen>
     <dimen name="status_bar_height_landscape">24dp</dimen>
     <dimen name="status_bar_height_portrait">24dp</dimen>
 
diff --git a/Moto/G8Power/res/values/config.xml b/Moto/G8Power/res/values/config.xml
index 61809ca..c86a105 100644
--- a/Moto/G8Power/res/values/config.xml
+++ b/Moto/G8Power/res/values/config.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="status_bar_height">122px</dimen>
     <dimen name="status_bar_height_landscape">24dp</dimen>
     <dimen name="status_bar_height_portrait">122px</dimen>
     <dimen name="quick_qs_offset_height">122px</dimen>
diff --git a/Moto/OneHyper/res/values/config.xml b/Moto/OneHyper/res/values/config.xml
index ce644fb..7f1db23 100644
--- a/Moto/OneHyper/res/values/config.xml
+++ b/Moto/OneHyper/res/values/config.xml
@@ -26,7 +26,6 @@
     <bool name="config_wifi_dual_band_support">true</bool>
     <bool name="config_displayBlanksAfterDoze">false</bool>
     <bool name="skip_restoring_network_selection">true</bool>
-    <dimen name="status_bar_height">80px</dimen>
     <dimen name="status_bar_height_landscape">24dp</dimen>
     <dimen name="status_bar_height_portrait">80px</dimen>
 
diff --git a/Realme/6/AndroidManifest.xml b/Realme/6/AndroidManifest.xml
index fab6b5e..1cb255f 100644
--- a/Realme/6/AndroidManifest.xml
+++ b/Realme/6/AndroidManifest.xml
@@ -3,7 +3,7 @@
           platformBuildVersionCode="27"
           platformBuildVersionName="8.1.0">
     <overlay android:isStatic="true"
-             android:priority="96"
+             android:priority="406"
              android:requiredSystemPropertyName="ro.build.overlay.deviceid"
              android:requiredSystemPropertyValue="+RMX2001"
              android:targetPackage="android"/>
diff --git a/overlay.mk b/overlay.mk
index 96b372d..23a580b 100755
--- a/overlay.mk
+++ b/overlay.mk
@@ -17,9 +17,8 @@ PRODUCT_PACKAGES += \
 	treble-overlay-caf-ims \
 	treble-overlay-devinputjack \
 	treble-overlay-duoqin-qin2pro \
-	treble-overlay-essential-ph-1 \
+	treble-overlay-essential-ph_1 \
 	treble-overlay-fairphone-fp3 \
-	treble-overlay-htc-exodus1 \
 	treble-overlay-gestures \
 	treble-overlay-htc-exodus1 \
 	treble-overlay-htc-u12plus \