From ca369f790bf6bc302bd439f3d9ff2f660b9bd739 Mon Sep 17 00:00:00 2001
From: Naman Sood <pseudonaman1396@gmail.com>
Date: Mon, 6 Nov 2023 01:16:41 -0500
Subject: [PATCH] bluejay: fix padding in status bar

These overlays seem to be left over from barbet. With these values
adjusted, the padding on left and right sides of the status bar is
more symmetrical, and in line with the bluejay stock ROM.

Co-authored-by: Michael Bestas <mkbestas@lineageos.org>
Change-Id: I10c3f495b7627200b05a24f5b259f789e62ada13
---
 .../frameworks/base/core/res/res/values/dimens.xml |  4 ++--
 .../packages/SystemUI/res/values-land/dimen.xml    |  4 ----
 .../base/packages/SystemUI/res/values/dimens.xml   | 14 +++++---------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/bluejay/overlay/frameworks/base/core/res/res/values/dimens.xml b/bluejay/overlay/frameworks/base/core/res/res/values/dimens.xml
index 011c49d..3f5a06f 100644
--- a/bluejay/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/bluejay/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -23,8 +23,8 @@
     <dimen name="rounded_corner_radius_top">47px</dimen>
     <dimen name="rounded_corner_radius_bottom">48px</dimen>
 
-   <!-- for 20dp of padding at 3.5px/dp at default density -->
-    <dimen name="rounded_corner_content_padding">47px</dimen>
+    <!-- Default paddings for content around the corners. -->
+    <dimen name="rounded_corner_content_padding">14dp</dimen>
 
     <!-- Height of the status bar.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
diff --git a/bluejay/overlay/frameworks/base/packages/SystemUI/res/values-land/dimen.xml b/bluejay/overlay/frameworks/base/packages/SystemUI/res/values-land/dimen.xml
index 4c591bb..dc398ac 100644
--- a/bluejay/overlay/frameworks/base/packages/SystemUI/res/values-land/dimen.xml
+++ b/bluejay/overlay/frameworks/base/packages/SystemUI/res/values-land/dimen.xml
@@ -16,10 +16,6 @@
 */
 -->
 <resources>
-    <!-- Landscape, just use the regular values -->
-    <dimen name="status_bar_padding_start">8dp</dimen>
-    <dimen name="status_bar_padding_end">8dp</dimen>
-
     <!-- the padding on the top of the statusbar (usually 0) -->
     <dimen name="status_bar_padding_top">0dp</dimen>
 </resources>
diff --git a/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index de39800..ac974c3 100644
--- a/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -16,7 +16,7 @@
 */
 -->
 <resources>
-    <!-- Don't need the left side padding due to being inset from the cutout -->
+    <!-- the padding on the start of the statusbar -->
     <dimen name="status_bar_padding_start">0dp</dimen>
 
     <!-- the padding on the top of the statusbar (usually 0) -->
@@ -25,15 +25,11 @@
     <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) -->
     <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</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
-    for the corners -->
-    <dimen name="system_icons_super_container_avatarless_margin_end">11px</dimen>
+    <!-- Margin on the left side of the carrier text on Keyguard -->
+    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
 
-    <!-- Multi user switch has some intrinsic padding to it -->
-    <dimen name="multi_user_switch_keyguard_margin">6dp</dimen>
-
-    <dimen name="keyguard_carrier_text_margin">0px</dimen>
+    <!--  Total minimum padding to enforce to ensure that the dot can always show  -->
+    <dimen name="ongoing_appops_dot_min_padding">14dp</dimen>
 
     <dimen name="config_rounded_mask_size">47px</dimen>
     <dimen name="config_rounded_mask_size_top">47px</dimen>