From f6b2fd324df2d01aaed5124497c2f9130116ec41 Mon Sep 17 00:00:00 2001
From: xSylla <syllamodder@gmail.com>
Date: Mon, 18 Apr 2022 11:55:18 +0200
Subject: [PATCH] monet: sync status bar changes

---
 .../base/core/res/res/values/dimens.xml       | 19 +++++--------------
 .../packages/SystemUI/res/values/dimens.xml   |  4 ++--
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/overlay/frameworks/base/core/res/res/values/dimens.xml b/overlay/frameworks/base/core/res/res/values/dimens.xml
index 8164a19..9831db5 100644
--- a/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -18,25 +18,16 @@
 */
 -->
 <resources>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">24dip</dimen>
-    
-    <!-- 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">@dimen/status_bar_height</dimen>
-
-    <!-- Height of the status bar in landscape -->
-    <dimen name="status_bar_height_landscape">@dimen/status_bar_height</dimen>
-
-    <!-- Radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">20.0dip</dimen>
+    <!-- Height of the status bar.
+    Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead. -->
+    <dimen name="status_bar_height">69.0px</dimen>
 
     <!-- Radius of the software rounded corners at the top of the display in its natural
         orientation. If zero, the value of rounded_corner_radius is used. -->
-    <dimen name="rounded_corner_radius_top">0px</dimen>
+    <dimen name="rounded_corner_radius_top">125px</dimen>
     
     <!-- Radius of the software rounded corners at the bottom of the display in its natural
         orientation. If zero, the value of rounded_corner_radius is used. -->
-    <dimen name="rounded_corner_radius_bottom">0px</dimen>
+    <dimen name="rounded_corner_radius_bottom">113px</dimen>
 
 </resources>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index cb7e2a3..6593a3d 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -21,9 +21,9 @@
 
     <!-- Margin on the left side of the carrier text on Keyguard -->
     <dimen name="keyguard_carrier_text_margin">40dp</dimen>
-
+    
     <!-- More realistic padding -->
-    <dimen name="rounded_corner_content_padding">18dp</dimen>
+    <dimen name="rounded_corner_content_padding">15dp</dimen>
 
     <!-- Location on the screen of the center of the physical power button. -->
    <dimen name="physical_power_button_center_screen_location_y">1000px</dimen>