From ea008f96ac8f5cb55db0f63db253e93807864f75 Mon Sep 17 00:00:00 2001
From: Naman Sood <pseudonaman1396@gmail.com>
Date: Mon, 6 Nov 2023 01:16:41 -0500
Subject: [PATCH] raviole: 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 the landscape top padding is correct.

Co-authored-by: Michael Bestas <mkbestas@lineageos.org>
Change-Id: I10c3f495b7627200b05a24f5b259f789e62ada13
---
 .../base/core/res/res/values/dimens.xml       |  4 ++--
 .../packages/SystemUI/res/values/dimens.xml   | 15 +++++--------
 .../base/core/res/res/values/dimens.xml       |  4 ++--
 .../SystemUI/res/values-land/dimen.xml        | 21 +++++++++++++++++++
 .../packages/SystemUI/res/values/dimens.xml   | 13 ++++++------
 5 files changed, 37 insertions(+), 20 deletions(-)
 create mode 100644 raven/overlay/frameworks/base/packages/SystemUI/res/values-land/dimen.xml

diff --git a/oriole/overlay/frameworks/base/core/res/res/values/dimens.xml b/oriole/overlay/frameworks/base/core/res/res/values/dimens.xml
index 447e59c..b69b2fd 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -16,7 +16,7 @@
 */
 -->
 <resources>
-   <!-- for 20dp of padding at 3.5px/dp at default density -->
-    <dimen name="rounded_corner_content_padding">50px</dimen>
+    <!-- Default paddings for content around the corners. -->
+    <dimen name="rounded_corner_content_padding">14dp</dimen>
 </resources>
 
diff --git a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 8e6ed37..e67e313 100644
--- a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/oriole/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 26 extra px of padding
-    for the corners -->
-    <dimen name="system_icons_super_container_avatarless_margin_end">26px</dimen>
+    <!-- Margin on the left side of the carrier text on Keyguard -->
+    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
 
-    <!-- Margin on the right side of the system icon group on Keyguard. -->
-    <dimen name="system_icons_keyguard_padding_end">4.5dp</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">71px</dimen>
     <dimen name="config_rounded_mask_size_top">71px</dimen>
@@ -46,7 +42,6 @@
     <dimen name="physical_volume_up_button_center_screen_location_y">950px</dimen>
     <dimen name="physical_volume_down_button_center_screen_location_y">1110px</dimen>
 
-
     <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with display size. -->
     <dimen name="lock_icon_padding">54px</dimen>
 
diff --git a/raven/overlay/frameworks/base/core/res/res/values/dimens.xml b/raven/overlay/frameworks/base/core/res/res/values/dimens.xml
index 1188e6c..b69b2fd 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -16,7 +16,7 @@
 */
 -->
 <resources>
-    <!-- for 20dp of padding at 3.5px/dp at default density -->
-    <dimen name="rounded_corner_content_padding">50px</dimen>
+    <!-- Default paddings for content around the corners. -->
+    <dimen name="rounded_corner_content_padding">14dp</dimen>
 </resources>
 
diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/values-land/dimen.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/values-land/dimen.xml
new file mode 100644
index 0000000..dc398ac
--- /dev/null
+++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values-land/dimen.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (c) 2021, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+-->
+<resources>
+    <!-- the padding on the top of the statusbar (usually 0) -->
+    <dimen name="status_bar_padding_top">0dp</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 78e96da..b58bb8c 100644
--- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -16,19 +16,20 @@
 */
 -->
 <resources>
+    <!-- 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) -->
     <dimen name="status_bar_padding_top">1px</dimen>
 
     <!-- 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 26 extra px of padding
-    for the corners -->
-    <dimen name="system_icons_super_container_avatarless_margin_end">26px</dimen>
+    <!-- Margin on the left side of the carrier text on Keyguard -->
+    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
 
-    <!-- Margin on the right side of the system icon group on Keyguard. -->
-    <dimen name="system_icons_keyguard_padding_end">6.5dp</dimen>
+    <!--  Total minimum padding to enforce to ensure that the dot can always show  -->
+    <dimen name="ongoing_appops_dot_min_padding">14dp</dimen>
 
     <!-- A path similar to frameworks/base/core/res/res/values/config.xml
         config_mainBuiltInDisplayCutout that describes a path larger than the exact path of a display