From 56ebc198e89e0c7164c1aacd4680bc874af3c147 Mon Sep 17 00:00:00 2001
From: Tadi <TadiT7@github.com>
Date: Mon, 19 Nov 2018 19:49:00 +0100
Subject: [PATCH] Fix everything about NoCutout overlay

---
 .../apps/overlays/NoCutoutOverlay/AndroidManifest.xml    | 2 +-
 .../overlays/NoCutoutOverlay/res/values-land/config.xml  | 9 ++++++---
 .../apps/overlays/NoCutoutOverlay/res/values/config.xml  | 5 +++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/overlay/packages/apps/overlays/NoCutoutOverlay/AndroidManifest.xml b/overlay/packages/apps/overlays/NoCutoutOverlay/AndroidManifest.xml
index 6743e2b..422b5da 100644
--- a/overlay/packages/apps/overlays/NoCutoutOverlay/AndroidManifest.xml
+++ b/overlay/packages/apps/overlays/NoCutoutOverlay/AndroidManifest.xml
@@ -20,7 +20,7 @@
         android:versionName="1.0">
     <overlay android:targetPackage="android"
             android:category="com.android.internal.display_cutout_emulation"
-            android:priority="42"/>
+            android:priority="0"/>
 
     <application android:label="@string/display_cutout_emulation_overlay" android:hasCode="false"/>
 </manifest>
diff --git a/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-land/config.xml b/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-land/config.xml
index bd52901..615902c 100644
--- a/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-land/config.xml
+++ b/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-land/config.xml
@@ -16,7 +16,10 @@
 
 <resources>
     <!-- Can't link to other dimensions here, but this should be status_bar_height_landscape -->
-    <dimen name="quick_qs_offset_height">28dp</dimen>
+    <dimen name="quick_qs_offset_height">24dp</dimen>
     <!-- Total height of QQS in landscape; quick_qs_offset_height + 128 -->
-    <dimen name="quick_qs_total_height">156dp</dimen>
-</resources>
\ No newline at end of file
+    <dimen name="quick_qs_total_height">152dp</dimen>
+    <!-- Because we hardcode status_bar_height in Oreo device overlays,
+         we also need to do it here. -->
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
diff --git a/overlay/packages/apps/overlays/NoCutoutOverlay/res/values/config.xml b/overlay/packages/apps/overlays/NoCutoutOverlay/res/values/config.xml
index f566a16..1f03d1d 100644
--- a/overlay/packages/apps/overlays/NoCutoutOverlay/res/values/config.xml
+++ b/overlay/packages/apps/overlays/NoCutoutOverlay/res/values/config.xml
@@ -28,6 +28,11 @@
     <!-- Height of the status bar -->
     <dimen name="status_bar_height_portrait">24dp</dimen>
     <dimen name="status_bar_height_landscape">24dp</dimen>
+    <!-- Because we hardcode status_bar_height in Oreo device overlays,
+         we also need to do it here. -->
+    <dimen name="status_bar_height">24dp</dimen>
+    <!-- For rounded corners to work, set rounded_corner_radius_bottom or rounded_corner_radius
+         in device overlay. -->
     <dimen name="rounded_corner_radius_top">@*android:dimen/rounded_corner_radius_bottom</dimen>
 
     <!-- Height of area above QQS where battery/time go (equal to status bar height if > 48dp) -->