From a17c45af94c34049a55fcc47d328f58414c09e93 Mon Sep 17 00:00:00 2001
From: lbill <lbill@google.com>
Date: Thu, 1 Jul 2021 13:39:17 +0000
Subject: [PATCH] Adjust status bar rounded corner and display cutout region

- Customize status_bar_height_portrait/landscape/keyguard
- Adjust punch hole display cutout region
- Adjust rounded radius for window corner

Test: atest SystemUITests
Test: atest android.systemui.cts.WindowInsetsBehaviorTests
Test: manual check visual
Bug: 190381022
Change-Id: If98f721f3e20270c5edfdc3b2f34ff8b8af41de4
---
 .../base/core/res/res/values/config.xml       | 19 +++++++++++++++----
 .../packages/SystemUI/res/values/dimens.xml   |  6 ++++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index b39b485..b2b1360 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -33,17 +33,17 @@
     </string>
 
     <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
-        M 655,0
-        h 126
+        M 653,0
+        h 130
         v 130
-        h -126
+        h -130
         Z
         @left
     </string>
 
 
     <!-- Radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">25px</dimen>
+    <dimen name="rounded_corner_radius">38px</dimen>
 
     <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
     <dimen name="rounded_corner_radius_adjustment">5px</dimen>
@@ -168,4 +168,15 @@
 
     <!-- The max vibration strength allowed in audio haptic channels. -->
     <item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.3</item>
+
+    <!-- Height of the status bar in portrait. The height should be
+         Max((status bar content height + waterfall top size), top cutout size) -->
+    <dimen name="status_bar_height_portrait">145px</dimen>
+    <dimen name="status_bar_height_landscape">28dp</dimen>
+
+    <!-- Height of area above QQS where battery/time go (equal to status bar) -->
+    <dimen name="quick_qs_offset_height">145px</dimen>
+
+    <!-- Height of the status bar header bar when on Keyguard (match status_bar_portrait) -->
+    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_portrait</dimen>
 </resources>
diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 9de5e14..68c8115 100644
--- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -17,7 +17,10 @@
 -->
 <resources>
     <!-- for 20dp of padding at 3.5px/dp at default density -->
-    <dimen name="rounded_corner_content_padding">5px</dimen>
+    <dimen name="rounded_corner_content_padding">50px</dimen>
+
+    <!-- the padding on the top of the statusbar (usually 0) -->
+    <dimen name="status_bar_padding_top">1px</dimen>
 
     <!-- Padding for the system icons on the keyguard (when no multi user switch is showing).
     The icons always have a 4dp padding in the container so we only need 56 extra px of padding
@@ -44,7 +47,6 @@
 
     <bool name="config_enableDisplayCutoutProtection">true</bool>
 
-
     <!-- Location on the screen of the center of the physical power button. -->
     <dimen name="physical_power_button_center_screen_location_y">940px</dimen>